diff --git a/src/Auth/Handler.php b/src/Auth/Handler.php
index 72fe1ca2..284fec75 100644
--- a/src/Auth/Handler.php
+++ b/src/Auth/Handler.php
@@ -22,7 +22,6 @@ class Handler
      * @var array
      *
      * @internal Experimental config:
-     * @todo Move this to a per-schema configuration and refer to this schema from the current endpoint
      * @link https://github.com/silverstripe/silverstripe-graphql/issues/58
      * @link https://github.com/silverstripe/silverstripe-graphql/issues/52
      */
diff --git a/src/Middleware/QueryCachingMiddleware.php b/src/Middleware/QueryCachingMiddleware.php
index 4d73a1ac..75a68375 100644
--- a/src/Middleware/QueryCachingMiddleware.php
+++ b/src/Middleware/QueryCachingMiddleware.php
@@ -112,7 +112,6 @@ protected function getCachedResponse(string $key): ?array
         // On cache success validate against cached classes
         foreach ($cached['classes'] as $class) {
             // Note: Could combine these clases into a UNION to cut down on extravagant queries
-            // Todo: We can get last-deleted/modified as well for versioned records
             $lastEditedDate = DataObject::get($class)->max('LastEdited');
             if (strtotime($lastEditedDate ?? '') > strtotime($cached['date'] ?? '')) {
                 // class modified, fail validation of cache
diff --git a/src/Schema/DataObject/InterfaceBuilder.php b/src/Schema/DataObject/InterfaceBuilder.php
index aaa07634..42254957 100644
--- a/src/Schema/DataObject/InterfaceBuilder.php
+++ b/src/Schema/DataObject/InterfaceBuilder.php
@@ -65,8 +65,6 @@ public function createInterfaces(ModelType $modelType, array $interfaceStack = [
         )
             ->setTypeResolver([AbstractTypeResolver::class, 'resolveType']);
 
-        // TODO: this makes a really good case for
-        // https://github.com/silverstripe/silverstripe-graphql/issues/364
         $validPlugins = [];
         foreach ($modelType->getPlugins() as $name => $config) {
             $plugin = $modelType->getPluginRegistry()->getPluginByID($name);