diff --git a/__init__.py b/__init__.py
index 06c9ad9863d2240a609c5fba36362da80258eb46..87d17bab42d57f406e340e65f12a653adeffc9ae 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,3 @@ for item in integrators.__all__:
 
 for item in _setup.__all__:
   __all__.append(item)
-
-## TODO Setup sollte keinen fuehrenden _ haben
diff --git a/integrators/__init__.py b/integrators/__init__.py
index e013919c7afe16fcd1f2d9913a5e244c535cde2e..f8d59cd4e7129d90690c5235df49aea1501d6a69 100644
--- a/integrators/__init__.py
+++ b/integrators/__init__.py
@@ -37,6 +37,3 @@ __all__ = \
   , "TPS1HEE_MPS" \
   , "KW1_MPS", "TPS1_KW2", "TPS1_MPS" \
   ]
-
-# TODO only "Integrator available for users!? maybe
-# TODO add MPS
diff --git a/integrators/_details/interfaces/parameterInterface.py b/integrators/_details/interfaces/parameterInterface.py
index 3d0e3c5b5783ad6cae3f5b4f9f46e9863375d57d..5f8f8833e656c8570bedc26937889b1b07de3b96 100644
--- a/integrators/_details/interfaces/parameterInterface.py
+++ b/integrators/_details/interfaces/parameterInterface.py
@@ -10,7 +10,6 @@ class ParameterInterface(_interface._Interface):
 
 
   def SetResultsFolder(self, foldername):
-    # TODO catch if changed during computation
     self.output.foldername = foldername