diff --git a/.hgignore b/.hgignore
index 1424f0a..81d4b47 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: glob
 .*.swp
 *.pyc
+*.orig
 iambuttbot_password
 persist
 pep8.py
diff --git a/plugins/seen.py.orig b/plugins/seen.py.orig
deleted file mode 100644
index cda2356..0000000
--- a/plugins/seen.py.orig
+++ /dev/null
@@ -1,76 +0,0 @@
-" seen.py: written by sklnd in about two beers July 2009"
-
-import os
-import time
-import datetime
-import sqlite3
-
-from util import hook, timesince
-
-
-dbname = "skybot.db"
-
-
-def adapt_datetime(ts):
-    return time.mktime(ts.timetuple())
-
-sqlite3.register_adapter(datetime.datetime, adapt_datetime)
-
-
-@hook.command(hook=r'(.*)', prefix=False, ignorebots=False)
-def seeninput(bot, input):
-    dbpath = os.path.join(bot.persist_dir, dbname)
-
-    conn = dbconnect(dbpath)
-    cursor = conn.cursor()
-    cursor.execute("insert or replace into seen(name, date, quote, chan)"
-        "values(?,?,?,?)", (input.nick, datetime.now(),
-        input.msg, input.chan))
-    conn.commit()
-    conn.close()
-
-
-@hook.command
-def seen(bot, input):
-    ".seen <nick> - Tell when a nickname was last in active in irc"
-
-    if len(input.msg) < 6:
-        return seen.__doc__
-
-    query = input.msg[6:].strip()
-
-    if query == input.nick:
-        return "Have you looked in a mirror lately?"
-
-    dbpath = os.path.join(bot.persist_dir, dbname)
-    conn = dbconnect(dbpath)
-    cursor = conn.cursor()
-
-    command = "select date, quote from seen where name = ? and chan = ?"
-    cursor.execute(command, (query, input.chan))
-    results = cursor.fetchone()
-
-    conn.close()
-
-    if(results != None):
-        reltime = timesince.timesince(datetime.fromtimestamp(results[0]))
-        return '%s was last seen %s ago saying: <%s> %s' % \
-                    (query, reltime, results[1])
-    else:
-        return "I've never seen %s" % query
-
-
-def dbconnect(db):
-    "check to see that our db has the the seen table and return a connection."
-    conn = sqlite3.connect(db)
-    results = conn.execute("select count(*) from sqlite_master where name=?",
-            ("seen", )).fetchone()
-
-    if(results[0] == 0):
-        conn.execute("create table if not exists "
-                     "seen(name varchar(30) not null, date datetime not null, "
-                     "quote varchar(250) not null, chan varchar(32) not null, "
-                     "primary key(name, chan));")
-        conn.commit()
-
-    return conn
diff --git a/plugins/tell.py.orig b/plugins/tell.py.orig
deleted file mode 100644
index d2af0af..0000000
--- a/plugins/tell.py.orig
+++ /dev/null
@@ -1,107 +0,0 @@
-" tell.py: written by sklnd in July 2009"
-
-import os
-import time
-import datetime
-import sqlite3
-
-from util import hook, timesince
-
-
-dbname = "skybot.db"
-
-
-def adapt_datetime(ts):
-    return time.mktime(ts.timetuple())
-
-sqlite3.register_adapter(datetime.datetime, adapt_datetime)
-
-
-@hook.command(hook=r'(.*)', prefix=False, ignorebots=True)
-def tellinput(bot, input):
-    dbpath = os.path.join(bot.persist_dir, dbname)
-    conn = dbconnect(dbpath)
-
-    cursor = conn.cursor()
-    command = "select count(name) from tell where name = ? and chan = ?"
-    results = cursor.execute(command, (input.nick, input.chan)).fetchone()
-
-
-    if results[0] > 0:
-        command = "select id, user_from, quote, date from tell " \
-                    "where name = ? and chan = ?"
-        tells = cursor.execute(command, (input.nick, input.chan)).fetchall()
-
-        for tell in tells:
-            reltime = timesince.timesince(datetime.fromtimestamp(tell[3]))
-            bot.reply('%(teller)s said %(reltime)s ago: %(quote)s' %
-                    {'teller': tell[1], 'quote': tell[2], 'reltime': reltime})
-            command = "delete from tell where id = ?"
-            cursor.execute(command, (tell[0], ))
-
-        conn.commit()
-    conn.close()
-
-
-@hook.command
-def tell(bot, input):
-    ".tell <nick> <message> - Relay <message> to <nick> the next time he talks"
-
-    if len(input.msg) < 6:
-        return tell.__doc__
-
-    query = input.msg[6:].strip().partition(" ")
-
-    if query[0] == input.nick:
-        return "No."
-
-
-    if query[2] != "":
-        dbpath = os.path.join(bot.persist_dir, dbname)
-        conn = dbconnect(dbpath)
-
-        command = "select count(*) from tell_probation where name=? and chan=?"
-        if conn.execute(command, (input.nick, input.chan)).fetchone()[0] > 0:
-            return "No."
-
-        command = "select count(*) from tell where name=? and user_from=?"
-        if conn.execute(command, (query[0], input.nick)).fetchone()[0] >= 3:
-            return "You've told that person too many things."
-
-        cursor = conn.cursor()
-        command = "insert into tell(name, user_from, quote, chan, date) " \
-                    "values(?,?,?,?,?)"
-        cursor.execute(command, (query[0], input.nick, query[2], input.chan,
-            datetime.now()))
-
-        conn.commit()
-        conn.close()
-        return "I'll pass that along."
-
-    else:
-        return tell.__doc__
-
-
-def dbconnect(db):
-    "check to see that our db has the the seen table and return a connection."
-    conn = sqlite3.connect(db)
-    results = conn.execute("select count(*) from sqlite_master where name=?",
-                ("tell", )).fetchone()
-
-    if results[0] == 0:
-        conn.execute("create table if not exists tell(id integer primary key "
-                     "autoincrement, name varchar(30) not null, user_from "
-                     "varchar(30) not null, quote varchar(250) not null, "
-                     "chan varchar(32) not null, date datetime not null);")
-
-        conn.commit()
-
-    results = conn.execute("select count(*) from sqlite_master where name=?",
-                ("tell_probation", )).fetchone()
-    if results[0] == 0:
-        conn.execute("create table if not exists "+ \
-                     "tell_probation(name varchar(30), chan varchar(32),"
-                     "primary key(name, chan));")
-        conn.commit()
-
-    return conn