diff --git a/boswatch/network/broadcast.py b/boswatch/network/broadcast.py
index f18716f..c4f8ea6 100644
--- a/boswatch/network/broadcast.py
+++ b/boswatch/network/broadcast.py
@@ -109,21 +109,16 @@ class BroadcastServer:
         """!Start the broadcast server in a new thread
 
         @return True or False"""
-        try:
-            if not self.isRunning:
-                logging.debug("start udp broadcast server")
-                self._serverThread = threading.Thread(target=self._listen)
-                self._serverThread.name = "BroadServ"
-                self._serverThread.daemon = True
-                self._serverShutdown = False
-                self._serverThread.start()
-                return True
-            else:
-                logging.warning("udp broadcast server always started")
-                return True
-        except:  # pragma: no cover
-            logging.exception("cannot start udp broadcast server thread")
-            return False
+        if not self.isRunning:
+            logging.debug("start udp broadcast server")
+            self._serverThread = threading.Thread(target=self._listen)
+            self._serverThread.name = "BroadServ"
+            self._serverThread.daemon = True
+            self._serverShutdown = False
+            self._serverThread.start()
+            return True
+        logging.warning("udp broadcast server always started")
+        return True
 
     def stop(self):
         """!Stop the broadcast server
@@ -142,8 +137,6 @@ class BroadcastServer:
             logging.warning("udp broadcast server always stopped")
             return True
 
-        return False
-
     def _listen(self):
         """!Broadcast server worker thread
 
diff --git a/boswatch/network/client.py b/boswatch/network/client.py
index ed8fcba..808ae51 100644
--- a/boswatch/network/client.py
+++ b/boswatch/network/client.py
@@ -43,9 +43,8 @@ class TCPClient:
                 self._sock = socket.create_connection((host, port))
                 logging.debug("connected to %s:%s", host, port)
                 return True
-            else:
-                logging.warning("client always connected")
-                return True
+            logging.warning("client always connected")
+            return True
         except ConnectionRefusedError:
             logging.error("cannot connect to %s:%s - connection refused", host, port)
         except socket.timeout:  # pragma: no cover
@@ -62,9 +61,8 @@ class TCPClient:
                 self._sock = None
                 logging.debug("disconnected")
                 return True
-            else:
-                logging.warning("client not connected")
-                return True
+            logging.warning("client not connected")
+            return True
         except AttributeError:
             logging.error("cannot disconnect - no connection established")
         return False
diff --git a/boswatch/network/server.py b/boswatch/network/server.py
index f9cdfce..b799afc 100644
--- a/boswatch/network/server.py
+++ b/boswatch/network/server.py
@@ -128,9 +128,8 @@ class TCPServer:
             self._server = None
             logging.debug("TCPServer stopped")
             return True
-        else:
-            logging.warning("server always stopped")
-            return True
+        logging.warning("server always stopped")
+        return True
 
     def countClientsConnected(self):
         """!Number of currently connected Clients
diff --git a/boswatch/utils/timer.py b/boswatch/utils/timer.py
index b58acc8..8bd82ea 100644
--- a/boswatch/utils/timer.py
+++ b/boswatch/utils/timer.py
@@ -54,9 +54,8 @@ class RepeatedTimer:
             self._thread.start()
             logging.debug("start repeatedTimer: %s", self._thread.name)
             return True
-        else:
-            logging.debug("repeatedTimer always started")
-            return True
+        logging.debug("repeatedTimer always started")
+        return True
 
     def stop(self):
         """!Stop the timer worker thread
diff --git a/module/module.py b/module/module.py
index 81e7392..814ddaf 100644
--- a/module/module.py
+++ b/module/module.py
@@ -35,7 +35,6 @@ class Module:
         self._cumTime = 0
         self._moduleTime = 0
         self._tmpTime = 0
-        self._tmpTime = 0
 
         # for statistics
         self._runCount = 0
@@ -68,7 +67,6 @@ class Module:
         self._moduleTime = time.time() - self._tmpTime
 
         self._cumTime += self._moduleTime
-        self._endTime = time.time()
 
         logging.debug("[%s] took %0.3f seconds", self._moduleName, self._moduleTime)
 
diff --git a/plugin/plugin.py b/plugin/plugin.py
index 149cb51..d603a81 100644
--- a/plugin/plugin.py
+++ b/plugin/plugin.py
@@ -42,7 +42,6 @@ class Plugin:
         self._setupTime = 0
         self._alarmTime = 0
         self._teardownTime = 0
-        self._endTime = 0
         self._tmpTime = 0
 
         # for statistics
@@ -111,7 +110,6 @@ class Plugin:
         self._teardownTime = time.time() - self._tmpTime
         self._sumTime = self._setupTime + self._alarmTime + self._teardownTime
         self._cumTime += self._sumTime
-        self._endTime = time.time()
 
         self._bwPacket = None