diff --git a/openflexure_microscope/api/static/src/App.vue b/openflexure_microscope/api/static/src/App.vue
index 09ccbb4f..320b0384 100644
--- a/openflexure_microscope/api/static/src/App.vue
+++ b/openflexure_microscope/api/static/src/App.vue
@@ -184,7 +184,6 @@ export default {
     this.checkConnection();
     // Handle guided tour
     // If the user has already completed or skipped the guided tour
-    // TODO: Only run this if connected to the API
     var completedTour = this.getLocalStorageObj("completedTour") || false;
     if (!completedTour) {
       this.$tours["guidedTour"].start();
@@ -207,8 +206,6 @@ export default {
     );
 
     // Keyboard shortcuts
-
-    // TODO: Shortcut guide
     Mousetrap.bind("?", () => {
       console.log(this.keyboardManual);
       this.toggleModalElement(this.$refs["keyboardManualModal"]); // Calls the mixin
diff --git a/openflexure_microscope/api/static/src/components/pluginComponents/JsonForm.vue b/openflexure_microscope/api/static/src/components/pluginComponents/JsonForm.vue
index 70262bd8..d53e9eb1 100644
--- a/openflexure_microscope/api/static/src/components/pluginComponents/JsonForm.vue
+++ b/openflexure_microscope/api/static/src/components/pluginComponents/JsonForm.vue
@@ -131,7 +131,6 @@ export default {
     },
 
     submitApiUri: function() {
-      // TODO: This could probably be handled more explicitally
       return this.pluginApiUri + this.route;
     }
   },
diff --git a/openflexure_microscope/api/v2/views/actions/camera.py b/openflexure_microscope/api/v2/views/actions/camera.py
index c7b7dd43..7c1f1fee 100644
--- a/openflexure_microscope/api/v2/views/actions/camera.py
+++ b/openflexure_microscope/api/v2/views/actions/camera.py
@@ -124,8 +124,6 @@ class GPUPreviewStartAPI(ActionView):
             window = [int(w) for w in window]
 
         microscope.camera.start_preview(fullscreen=fullscreen, window=window)
-
-        # TODO: Make schema for microscope state
         return microscope.state
 
 
@@ -136,5 +134,4 @@ class GPUPreviewStopAPI(ActionView):
         """
         microscope = find_component("org.openflexure.microscope")
         microscope.camera.stop_preview()
-        # TODO: Make schema for microscope state
         return microscope.state
diff --git a/openflexure_microscope/api/v2/views/actions/stage.py b/openflexure_microscope/api/v2/views/actions/stage.py
index 80e2a037..53e0b0b1 100644
--- a/openflexure_microscope/api/v2/views/actions/stage.py
+++ b/openflexure_microscope/api/v2/views/actions/stage.py
@@ -45,7 +45,6 @@ class MoveStageAPI(ActionView):
         else:
             logging.warning("Unable to move. No stage found.")
 
-        # TODO: Make schema for microscope state
         return microscope.state["stage"]["position"]
 
 
@@ -60,5 +59,4 @@ class ZeroStageAPI(ActionView):
         with microscope.stage.lock(timeout=1):
             microscope.stage.zero_position()
 
-        # TODO: Make schema for microscope state
         return microscope.state["stage"]