diff --git a/CouchPotato.py b/CouchPotato.py
index dd1e654..0099278 100755
--- a/CouchPotato.py
+++ b/CouchPotato.py
@@ -89,7 +89,6 @@ class Loader(object):
                 if self.runAsDaemon():
                     try: self.daemon.stop()
                     except: pass
-                    self.daemon.delpid()
             except:
                 self.log.critical(traceback.format_exc())
 
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
index e2b5bdf..280ef75 100644
--- a/couchpotato/runner.py
+++ b/couchpotato/runner.py
@@ -10,7 +10,6 @@ from tornado.ioloop import IOLoop
 from tornado.web import RequestHandler
 from tornado.wsgi import WSGIContainer
 from werkzeug.contrib.cache import FileSystemCache
-import atexit
 import locale
 import logging
 import os.path
@@ -44,11 +43,6 @@ def getOptions(base_path, args):
 
     return options
 
-
-def cleanup():
-    fireEvent('app.shutdown', single = True)
-    time.sleep(1)
-
 # Tornado monkey patch logging..
 def _log(status_code, request):
 
@@ -129,8 +123,6 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
     # Development
     development = Env.setting('development', default = False, type = 'bool')
     Env.set('dev', development)
-    if not development:
-        atexit.register(cleanup)
 
     # Disable logging for some modules
     for logger_name in ['enzyme', 'guessit', 'subliminal', 'apscheduler']: