diff --git a/pyproject.toml b/pyproject.toml
index 3cef0b2d..fb072b44 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -112,7 +112,7 @@ select = [
     "B", # Flake8 bugbear
     "A", # Flake8 builtins checker
     "C", # Flake8 comprehensions
-#    "FIX", #TODO/FIXME's in code. These should be added during development for ongoing tasks.
+    "FIX", #TODO/FIXME's in code. These should be added during development for ongoing tasks.
            # If they are not fixed before merge they should be converted to GitLab issues
 #    "LOG", # Flake8 logging issues (pedantic logger formatting issues can be added with "G")
 #    "T20", # Warns for print statements, production code should log
diff --git a/src/openflexure_microscope_server/server/legacy_api.py b/src/openflexure_microscope_server/server/legacy_api.py
index e877f939..5e939116 100644
--- a/src/openflexure_microscope_server/server/legacy_api.py
+++ b/src/openflexure_microscope_server/server/legacy_api.py
@@ -21,10 +21,9 @@ def add_v2_endpoints(thing_server: lt.ThingServer) -> None:
     """Add the v2 API endpoints for OpenFlexure Connect discoverability."""
     app = thing_server.app
 
-    # TODO: update openflexure connect to make this unnecessary!!
     # The endpoints below fool OpenFlexure Connect into thinking we are a
     # v2 microscope, so we show up correctly.
-    # This is necessary until Connect is rebuilt.
+    # This is necessary until Connect is rebuilt. See #557.
     @app.get("/routes")
     def routes_stub() -> dict[str, dict]:
         """Return a stub list of routes.
diff --git a/src/openflexure_microscope_server/things/system.py b/src/openflexure_microscope_server/things/system.py
index d2b022bb..ba70f065 100644
--- a/src/openflexure_microscope_server/things/system.py
+++ b/src/openflexure_microscope_server/things/system.py
@@ -52,7 +52,6 @@ class OpenFlexureSystem(lt.Thing):
 
     @microscope_id.setter
     def microscope_id(self, uuid: UUID) -> None:
-        # TODO make read only but still settable from disk
         self._microscope_id = uuid
 
     @lt.thing_property