diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index f9e6732d4f51aa11bde96791df2d103f2bcf14ed..df33da7cbe0e778c6531bf3685f4b96e96359e00 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -2437,8 +2437,9 @@ class Messages(list):
     """
 
     def clear_server_messages(self):
-        """Removes all messages of type error, warning and info."""
-        # TODO Why do we not remove ALL messages?
+        """Removes all messages of type error, warning and info. All other
+        messages types are custom types which should be handled by custom
+        code."""
         rem = []
 
         for m in self:
diff --git a/src/caosdb/utils/checkFileSystemConsistency.py b/src/caosdb/utils/checkFileSystemConsistency.py
index a142c1dd7ffd1a4e6ee6cfc85891e1bf70f98d89..6c053fdca6acb3a6585589c0e6298ba0704ea590 100755
--- a/src/caosdb/utils/checkFileSystemConsistency.py
+++ b/src/caosdb/utils/checkFileSystemConsistency.py
@@ -30,7 +30,6 @@ import caosdb as db
 
 from argparse import ArgumentParser
 from argparse import RawDescriptionHelpFormatter
-from _testcapi import raise_exception
 
 __all__ = []
 __version__ = 0.1