diff --git a/discordbot/titanembeds/bot.py b/discordbot/titanembeds/bot.py
index fc52eb9..25818ee 100644
--- a/discordbot/titanembeds/bot.py
+++ b/discordbot/titanembeds/bot.py
@@ -3,7 +3,6 @@ from titanembeds.database import DatabaseInterface
 from titanembeds.commands import Commands
 from titanembeds.socketio import SocketIOInterface
 from titanembeds.poststats import DiscordBotsOrg, BotsDiscordPw
-from titanembeds.cleanup_db import CleanupDatabase
 from collections import deque
 import discord
 import aiohttp
@@ -24,7 +23,6 @@ class Titan(discord.AutoShardedClient):
         self.database = DatabaseInterface(self)
         self.command = Commands(self, self.database)
         self.socketio = SocketIOInterface(self, config["redis-uri"])
-        self.cleanup_db = CleanupDatabase(self, self.database)
         
         self.delete_list = deque(maxlen=100) # List of msg ids to prevent duplicate delete
         
@@ -80,7 +78,6 @@ class Titan(discord.AutoShardedClient):
         self.discordBotsOrg = DiscordBotsOrg(self.user.id, config.get("discord-bots-org-token", None))
         self.botsDiscordPw = BotsDiscordPw(self.user.id, config.get("bots-discord-pw-token", None))
         await self.postStats()
-        await self.cleanup_db.start_cleanup()
 
     async def on_message(self, message):
         await self.socketio.on_message(message)
diff --git a/discordbot/titanembeds/cleanup_db.py b/discordbot/titanembeds/cleanup_db.py
deleted file mode 100644
index 9710f4f..0000000
--- a/discordbot/titanembeds/cleanup_db.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from titanembeds.database.guilds import Guilds
-from titanembeds.database.messages import Messages
-import logging
-import json
-import random
-
-class CleanupDatabase:
-    def __init__(self, bot, db):
-        self.bot = bot
-        self.db = db
-        self.logger = logging.getLogger("titan_cleanupdb")
-        
-        self.logger.setLevel(logging.DEBUG)
-        fh = logging.FileHandler("titan_cleanupdb.log")
-        fh.setLevel(logging.DEBUG)
-        session_id = str(random.randrange(100))
-        formatter = logging.Formatter("%(asctime)s - {0} - %(levelname)s - %(message)s".format(session_id))
-        fh.setFormatter(formatter)
-        self.logger.addHandler(fh)
-        self.logger.info("Initialized Database Cleaning Class with session id of " + session_id)
-    
-    async def start_cleanup(self):
-        self.logger.info("Started cleaning up task")
-        self.logger.info("Cleaning up unused guilds")
-        await self.db.remove_unused_guilds(list(self.bot.guilds))
-        self.logger.info("Started cleaning up messages task, hopefully cleaned up unused guilds")
-        self.bot.loop.run_in_executor(None, self._start_cleanup)
-    
-    def _start_cleanup(self):
-        with self.db.get_session() as session:
-            guilds = session.query(Guilds).all()
-            count = 0
-            for guild in guilds:
-                count += 1
-                self.logger.info("[{}] snowflake-{} name-{}".format(count, guild.guild_id, guild.name))
-                try:
-                    channelsjson = json.loads(guild.channels)
-                except:
-                    continue
-                active_channels = []
-                for channel in channelsjson:
-                    chanid = channel["id"]
-                    active_channels.append(chanid)
-                    keep_these = session.query(Messages.message_id).filter(Messages.channel_id == chanid).order_by(Messages.timestamp.desc()).limit(50)
-                    d = session.query(Messages).filter(Messages.channel_id == chanid, ~Messages.message_id.in_(keep_these)).delete(synchronize_session=False)
-                    session.commit()
-                    self.logger.info("    --{} [{}]".format(channel["name"], d))
-                d = session.query(Messages).filter(Messages.guild_id == guild.guild_id, ~Messages.channel_id.in_(active_channels)).delete(synchronize_session=False)
-                session.commit()
-                self.logger.info("    INACTIVE {}".format(d))
-            self.logger.info("done!")
\ No newline at end of file