diff --git a/linspector/core/daemon.py b/linspector/core/daemon.py
index 3f10380..fdb8fd3 100644
--- a/linspector/core/daemon.py
+++ b/linspector/core/daemon.py
@@ -1,6 +1,5 @@
 """
-
-Copyright (c) 2011-2013 "Johannes Findeisen and Rafael Timmerberg"
+Copyright (c) 2011-2013 by Johannes Findeisen and Rafael Timmerberg
 
 This file is part of Linspector (http://linspector.org).
 
@@ -23,27 +22,13 @@ import os
 import time
 import atexit
 
-from signal import SIGTERM
 from logging import getLogger
+from signal import SIGTERM
 
 logger = getLogger(__name__)
 
 
-class LinspectorDaemon(Daemon):
-    def run(self):
-        while True:
-            try:
-                a = 2
-                #logger.writeLogToFile(_logfile, "Running!")
-                print "running!"
-            except Exception as err:
-                #logger.writeLogToFile(_logfile, str(err))
-                print "failed"
-                sys.exit(1)
-            time.sleep(1)
-
-
-class Daemon:
+class LinspectorDaemon():
     """
     A generic daemon class.
 
diff --git a/linspector/core/linspector_daemon.py b/linspector/core/linspector_daemon.py
deleted file mode 100644
index 5f81185..0000000
--- a/linspector/core/linspector_daemon.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""
-Copyright (c) 2011-2013 "Johannes Findeisen and Rafael Timmerberg"
-
-This file is part of Linspector (http://linspector.org).
-
-Linspector is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from logging import getLogger
-
-from ..core.daemon import Daemon
-
-logger = getLogger(__name__)
-
-
-class LinspectorDaemon(Daemon):
-    def run(self):
-        while True:
-            try:
-                a = 2
-                logger.writeLogToFile(_logfile, "Running!")
-                print "running!"
-            except Exception as err:
-                #logger.writeLogToFile(_logfile, str(err))
-                print "failed"
-                sys.exit(1)
-            time.sleep(1)
\ No newline at end of file