diff --git a/app/machinecontrol.py b/app/machinecontrol.py
index bc0b8e0..cbd938a 100644
--- a/app/machinecontrol.py
+++ b/app/machinecontrol.py
@@ -313,8 +313,6 @@ class Machine():
     def get_ip(self):
         """ Returns the IP of the main ethernet interface of this machine """
 
-        # TODO: Create special code to extract windows IPs
-
         # TODO: Find a smarter way to get the ip
 
         return self.vm_manager.get_ip()
diff --git a/app/metasploit.py b/app/metasploit.py
index c79cf86..9cb5170 100644
--- a/app/metasploit.py
+++ b/app/metasploit.py
@@ -130,7 +130,6 @@ class Metasploit():
             ip = target.get_ip()   # Limp on feature if we can not get a name resolution
             name_resolution_worked = False
             print(f"Name resolution for {target.get_ip()} failed. Sessions are: {self.get_client().sessions.list}")
-            # TODO: Try to get the ip address from kali system
 
         retries = 100
         while retries > 0:
diff --git a/app/pluginmanager.py b/app/pluginmanager.py
index 722e656..d81d92a 100644
--- a/app/pluginmanager.py
+++ b/app/pluginmanager.py
@@ -139,9 +139,6 @@ class PluginManager():
     def print_check(self):
         """ Iterates through all installed plugins and verifies them """
 
-        # TODO: Identical name
-        # TODO: identical class name
-
         names = {}
         cnames = {}
 
diff --git a/experiment_control.py b/experiment_control.py
index 51c27ca..504015b 100644
--- a/experiment_control.py
+++ b/experiment_control.py
@@ -6,7 +6,6 @@ import argparse
 from app.experimentcontrol import Experiment
 
 
-# TODO: Add verbose settings: -v to -vvv
 # TODO: Name experiments. Name will be written to the log
 
 def explain(args):  # pylint: disable=unused-argument
diff --git a/plugins/base/plugin_base.py b/plugins/base/plugin_base.py
index ebf532a..0540530 100644
--- a/plugins/base/plugin_base.py
+++ b/plugins/base/plugin_base.py
@@ -7,8 +7,6 @@ import yaml
 from app.exceptions import PluginError
 import app.exceptions
 
-# TODO: Proper planning and re-building of plugin system. Especially the default config handling should be streamlined. All the plugin types should have a very similar programming interface.
-
 
 class BasePlugin():
     """ Base class for plugins """
@@ -79,7 +77,6 @@ class BasePlugin():
         @param config: A dict with system configuration relevant for all plugins
         """
 
-        # TODO: Verify if it works properly. It should wotk thanks to the new design
         # self.sysconf["abs_machinepath_internal"] = config["abs_machinepath_internal"]
         # self.sysconf["abs_machinepath_external"] = config["abs_machinepath_external"]
         self.load_default_config()
diff --git a/plugins/default/sensors/linux_filebeat/linux_filebeat_plugin.py b/plugins/default/sensors/linux_filebeat/linux_filebeat_plugin.py
index b25ac89..6a4d6ba 100644
--- a/plugins/default/sensors/linux_filebeat/linux_filebeat_plugin.py
+++ b/plugins/default/sensors/linux_filebeat/linux_filebeat_plugin.py
@@ -25,8 +25,6 @@ class LinuxFilebeatPlugin(SensorPlugin):
     def process_templates(self):
         """ process jinja2 templates of the config files and insert own config """
 
-        # TODO: Implement
-
         env = Environment(
             loader=FileSystemLoader(self.get_plugin_path(), encoding='utf-8', followlinks=False),
             autoescape=select_autoescape()