diff --git a/client/src/boot/index.js b/client/src/boot/index.js
index e5d8a005..c166c1cd 100644
--- a/client/src/boot/index.js
+++ b/client/src/boot/index.js
@@ -16,7 +16,6 @@ window.document.addEventListener('DOMContentLoaded', () => {
     const element = window.document.getElementById('mfa-app');
     const schemaURL = element.dataset.schemaurl;
 
-    // todo allow Redux to come from react-injector
     const store = createStore(
       combineReducers(Injector.reducer.getAll()),
       window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
diff --git a/client/src/components/Verify.js b/client/src/components/Verify.js
index b6b1a4fb..292692a6 100644
--- a/client/src/components/Verify.js
+++ b/client/src/components/Verify.js
@@ -46,7 +46,6 @@ class Verify extends Component {
     if (defaultMethodDefinition) {
       this.setSelectedMethod(defaultMethodDefinition);
     } else {
-      // TODO is this expected? We have the "first" method as the fallback default?
       // Use the first method that's not the backup method
       this.setSelectedMethod(backupMethod
         ? registeredMethods.find(method => method.urlSegment !== backupMethod.urlSegment)
@@ -148,7 +147,7 @@ class Verify extends Component {
             onCompleteVerification();
             return null;
           case 202:
-            // TODO 202 is returned if multiple MFA methods are required...
+            // 202 is returned if multiple MFA methods are required...
             this.setState({
               loading: false,
             });
diff --git a/docs/en/creating-mfa-method-backend.md b/docs/en/creating-mfa-method-backend.md
index a74153b5..1b7baf03 100644
--- a/docs/en/creating-mfa-method-backend.md
+++ b/docs/en/creating-mfa-method-backend.md
@@ -1,7 +1,5 @@
 # Creating a new MFA method: Backend
 
-<!-- TODO: Documentation covering Method interfaces, etc. -->
-
 ## Method availability
 
 If your method isn't available in some situations, and you can determine this via server-side state, you can provide
diff --git a/src/RequestHandler/VerificationHandlerTrait.php b/src/RequestHandler/VerificationHandlerTrait.php
index 7218edff..00f43e70 100644
--- a/src/RequestHandler/VerificationHandlerTrait.php
+++ b/src/RequestHandler/VerificationHandlerTrait.php
@@ -42,7 +42,7 @@ protected function createStartVerificationResponse(
             $registeredMethod = RegisteredMethodManager::singleton()->getFromMember($member, $requestedMethod);
         }
 
-        // ...Or use the default (TODO: Should we have the default as a fallback? Maybe just if no method is specified?)
+        // Use the default method if there's no requested method
         if (!$registeredMethod) {
             $registeredMethod = $member->DefaultRegisteredMethod;
         }
diff --git a/tests/php/Stub/Null/Method.php b/tests/php/Stub/Null/Method.php
index 1549d600..44553ee0 100644
--- a/tests/php/Stub/Null/Method.php
+++ b/tests/php/Stub/Null/Method.php
@@ -58,7 +58,7 @@ public function getRegisterHandler(): RegisterHandlerInterface
      */
     public function getThumbnail(): string
     {
-        // TODO: Implement getThumbnail() method.
+        return '';
     }
 
     /**
@@ -69,7 +69,7 @@ public function getThumbnail(): string
      */
     public function applyRequirements(): void
     {
-        // TODO: Implement applyRequirements() method.
+        return;
     }
 
     /**
@@ -89,6 +89,6 @@ public function isAvailable(): bool
      */
     public function getUnavailableMessage(): string
     {
-        // TODO: Implement getUnavailableMessage() method.
+        return '';
     }
 }
diff --git a/tests/php/Stub/Null/RegisterHandler.php b/tests/php/Stub/Null/RegisterHandler.php
index 3ab7f086..6ccba534 100644
--- a/tests/php/Stub/Null/RegisterHandler.php
+++ b/tests/php/Stub/Null/RegisterHandler.php
@@ -19,7 +19,7 @@ class RegisterHandler implements RegisterHandlerInterface, TestOnly
      */
     public function start(StoreInterface $store): array
     {
-        // TODO: Implement start() method.
+        return [];
     }
 
     /**
@@ -32,7 +32,7 @@ public function start(StoreInterface $store): array
      */
     public function register(HTTPRequest $request, StoreInterface $store): Result
     {
-        // TODO: Implement register() method.
+        return new Result();
     }
 
     /**
@@ -44,7 +44,7 @@ public function register(HTTPRequest $request, StoreInterface $store): Result
      */
     public function getDescription(): string
     {
-        // TODO: Implement getDescription() method.
+        return '';
     }
 
     /**
@@ -54,7 +54,7 @@ public function getDescription(): string
      */
     public function getSupportLink(): string
     {
-        // TODO: Implement getSupportLink() method.
+        return '';
     }
 
     /**
@@ -64,7 +64,7 @@ public function getSupportLink(): string
      */
     public function getSupportText(): string
     {
-        // TODO: Implement getSupportText() method.
+        return '';
     }
 
     /**
@@ -74,6 +74,6 @@ public function getSupportText(): string
      */
     public function getComponent(): string
     {
-        // TODO: Implement getComponent() method.
+        return '';
     }
 }
diff --git a/tests/php/Stub/Null/VerifyHandler.php b/tests/php/Stub/Null/VerifyHandler.php
index 503d36f3..86075b3a 100644
--- a/tests/php/Stub/Null/VerifyHandler.php
+++ b/tests/php/Stub/Null/VerifyHandler.php
@@ -21,7 +21,7 @@ class VerifyHandler implements VerifyHandlerInterface, TestOnly
      */
     public function start(StoreInterface $store, RegisteredMethod $method): array
     {
-        // TODO: Implement start() method.
+        return [];
     }
 
     /**
@@ -35,7 +35,7 @@ public function start(StoreInterface $store, RegisteredMethod $method): array
      */
     public function verify(HTTPRequest $request, StoreInterface $store, RegisteredMethod $registeredMethod): Result
     {
-        // TODO: Implement verify() method.
+        return new Result();
     }
 
     /**
@@ -45,6 +45,6 @@ public function verify(HTTPRequest $request, StoreInterface $store, RegisteredMe
      */
     public function getComponent(): string
     {
-        // TODO: Implement getComponent() method.
+        return '';
     }
 }