diff --git a/src/__init__.py b/src/__init__.py
index a16bd886..cb673a50 100755
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -63,7 +63,6 @@ from onionrblocks.deleteplaintext import delete_plaintext_no_blacklist  # noqa
 setup.setup_config()
 
 import config # noqa
-import filenuke
 from utils import identifyhome
 
 if config.get('advanced.security_auditing', True):
@@ -88,8 +87,6 @@ if ran_as_script:
 
     # Wipe Onionr data directory if security level calls for it
     config.reload()
-    if config.get('general.security_level', 1) >= 2:
-        filenuke.nuke.clean_tree(identifyhome.identify_home())
 
     # Cleanup standard out/err because Python refuses to do it itsself
     try:
diff --git a/src/onionrcommands/daemonlaunch/__init__.py b/src/onionrcommands/daemonlaunch/__init__.py
index 20f31ff2..acc65fad 100755
--- a/src/onionrcommands/daemonlaunch/__init__.py
+++ b/src/onionrcommands/daemonlaunch/__init__.py
@@ -7,11 +7,12 @@ import sys
 import platform
 import sqlite3
 from threading import Thread
+
 from gevent import time
 from gevent import spawn
 from stem.connection import IncorrectPassword
-
 import toomanyobjs
+import filenuke
 
 import config
 import onionrstatistics
@@ -165,6 +166,8 @@ def daemon():
     better_sleep(5)
 
     cleanup.delete_run_files()
+    if config.get('general.security_level', 1) >= 2:
+        filenuke.nuke.clean_tree(identifyhome.identify_home())
 
 
 def _ignore_sigint(sig, frame):  # pylint: disable=W0612,W0613