diff --git a/SABnzbd.py b/SABnzbd.py
index f0f5bf3..a08c12a 100755
--- a/SABnzbd.py
+++ b/SABnzbd.py
@@ -1609,7 +1609,7 @@ def main():
             if rc == win32event.WAIT_OBJECT_0:
                 if mail:
                     mail.send('stop')
-                sabnzbd.save_state(flag=True)
+                sabnzbd.save_state()
                 logging.info('Leaving SABnzbd')
                 sabnzbd.SABSTOP = True
                 return
diff --git a/sabnzbd/__init__.py b/sabnzbd/__init__.py
index 85e457a..9ea4bc1 100644
--- a/sabnzbd/__init__.py
+++ b/sabnzbd/__init__.py
@@ -164,7 +164,7 @@ def sig_handler(signum=None, frame=None):
     if type(signum) != type(None):
         logging.warning(T('Signal %s caught, saving and exiting...'), signum)
     try:
-        save_state(flag=True)
+        save_state()
         sabnzbd.zconfig.remove_server()
     finally:
         if sabnzbd.WIN32:
@@ -299,14 +299,6 @@ def initialize(pause_downloader=False, clean_up=False, evalSched=False, repair=0
     if check_repair_request():
         repair = 2
         pause_downloader = True
-    else:
-        # Check crash detection file
-        # if load_admin(TERM_FLAG_FILE, remove=True):
-            # Repair mode 2 is a bit over an over-reaction!
-        pass  # repair = 2
-
-    # Set crash detection file
-    # save_admin(1, TERM_FLAG_FILE)
 
     # Initialize threads
     rss.init()
@@ -418,7 +410,7 @@ def halt():
 
         # Save State
         try:
-            save_state(flag=True)
+            save_state()
         except:
             logging.error(T('Fatal error at saving state'), exc_info=True)
 
@@ -512,7 +504,7 @@ def add_url(url, pp=None, script=None, cat=None, priority=None, nzbname=None):
     return future_nzo.nzo_id
 
 
-def save_state(flag=False):
+def save_state():
     """ Save all internal bookkeeping to disk """
     ArticleCache.do.flush_articles()
     NzbQueue.do.save()
@@ -521,9 +513,6 @@ def save_state(flag=False):
     Rating.do.save()
     DirScanner.do.save()
     PostProcessor.do.save()
-    # if flag:
-    #    # Remove crash detector
-    #    load_admin(TERM_FLAG_FILE, remove=True)
 
 
 def pause_all():
diff --git a/sabnzbd/constants.py b/sabnzbd/constants.py
index 751c74e..ed10a88 100644
--- a/sabnzbd/constants.py
+++ b/sabnzbd/constants.py
@@ -43,7 +43,6 @@ QUEUE_FILE_NAME = QUEUE_FILE_TMPL % QUEUE_VERSION
 POSTPROC_QUEUE_FILE_NAME = 'postproc%s.sab' % POSTPROC_QUEUE_VERSION
 RSS_FILE_NAME = 'rss_data.sab'
 SCAN_FILE_NAME = 'watched_data2.sab'
-TERM_FLAG_FILE = 'running.sab'
 FUTURE_Q_FOLDER = 'future'
 JOB_ADMIN = '__ADMIN__'
 VERIFIED_FILE = '__verified__'