diff --git a/ruby/kwikemon.rb b/ruby/kwikemon.rb
index ab2c92e..f28ab1d 100644
--- a/ruby/kwikemon.rb
+++ b/ruby/kwikemon.rb
@@ -38,6 +38,10 @@ module Kwikemon
     redis.sadd(key('monitors'), name)
   end
 
+  Monitor.on(:remove) do |name|
+    redis.srem(key('monitors'), name)
+  end
+
 
   # Set `name` to `value`.
   #
@@ -95,7 +99,7 @@ module Kwikemon
 
   # Remove the monitor named `name`.
   def remove(name)
-    Monitor.new(name).delete
+    Monitor.new(name).remove
   end
 
   # Clear all monitors.
@@ -112,6 +116,7 @@ module Kwikemon
     end
   end
 
+
 private
 
   def config
diff --git a/ruby/monitor.rb b/ruby/monitor.rb
index f6172ec..083edcf 100644
--- a/ruby/monitor.rb
+++ b/ruby/monitor.rb
@@ -53,6 +53,12 @@ module Kwikemon
       self
     end
 
+    def remove
+      redis.del(key)
+      self.class.emit(:remove, name)
+      self
+    end
+
     def key
       Kwikemon.key("monitor:#{name}")
     end
@@ -70,7 +76,7 @@ module Kwikemon
     end
 
     def text
-      @text ||= exists? ? redis.hget(key, 'name') : nil
+      @text ||= exists? ? redis.hget(key, 'text') : nil
     end
 
 
diff --git a/ruby/version.rb b/ruby/version.rb
index 9fdb351..b14ed93 100644
--- a/ruby/version.rb
+++ b/ruby/version.rb
@@ -1,3 +1,3 @@
 module Kwikemon
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end