diff --git a/octoprint/daemon.py b/octoprint/daemon.py
index 919ae9c..bc4ce67 100644
--- a/octoprint/daemon.py
+++ b/octoprint/daemon.py
@@ -79,10 +79,6 @@ class Daemon:
 		self.daemonize()
 		self.run()
 
-		# Should the daemon terminate ensure pid removal
-		if os.path.exists(self.pidfile):
-			os.remove(self.pidfile)
-
 	def stop(self):
 		"""Stop the daemon."""
 
diff --git a/octoprint/server.py b/octoprint/server.py
index 388c906..5851cd5 100644
--- a/octoprint/server.py
+++ b/octoprint/server.py
@@ -20,7 +20,8 @@ SUCCESS = {}
 UPLOAD_FOLDER = settings().getBaseFolder("uploads")
 BASEURL = "/ajax/"
 app = Flask("octoprint")
-# Only instantiated by the app runner
+# Only instantiated by the Server().run() method
+# In order that threads don't start too early when running as a Daemon
 printer = None 
 gcodeManager = None