diff --git a/client/src/js/LeftAndMain_Subsites.js b/client/src/js/LeftAndMain_Subsites.js
index 57be90a3..3c8b6098 100644
--- a/client/src/js/LeftAndMain_Subsites.js
+++ b/client/src/js/LeftAndMain_Subsites.js
@@ -61,9 +61,6 @@
     });
 
     $('.cms-edit-form').entwine({
-      /**
-       * TODO: Fix with Entwine API extension. See https://github.com/silverstripe/silverstripe-subsites/pull/125
-       */
       getChangeTrackerOptions() {
         // Figure out if we're still returning the default value
         const isDefault = (this.entwineData('ChangeTrackerOptions') === undefined);
diff --git a/client/src/js/SubsitesTreeDropdownField.js b/client/src/js/SubsitesTreeDropdownField.js
index cddf2d5c..472f7af5 100644
--- a/client/src/js/SubsitesTreeDropdownField.js
+++ b/client/src/js/SubsitesTreeDropdownField.js
@@ -8,7 +8,6 @@
      */
     $('select.subsitestreedropdownfield-chooser').entwine({
       onchange() {
-        // TODO Data binding between two fields
         const name = this.attr('name').replace('_SubsiteID', '');
         const field = $(`#Form_EditForm_${name}`).first();
         field.setValue(0);
diff --git a/src/Extensions/ErrorPageSubsite.php b/src/Extensions/ErrorPageSubsite.php
index 2f5c41f6..b66e4ba9 100644
--- a/src/Extensions/ErrorPageSubsite.php
+++ b/src/Extensions/ErrorPageSubsite.php
@@ -48,7 +48,6 @@ public function updateErrorFilename(&$name, &$statusCode)
             $subdomainPart = "-{$subdomain}";
         }
 
-        // @todo implement Translatable namespace
         if (singleton(SiteTree::class)->hasExtension('Translatable')
             && $locale
             && $locale != Translatable::default_locale()
diff --git a/src/Extensions/FileSubsites.php b/src/Extensions/FileSubsites.php
index 39a7a96a..671c2b43 100644
--- a/src/Extensions/FileSubsites.php
+++ b/src/Extensions/FileSubsites.php
@@ -56,10 +56,6 @@ public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
             return;
         }
 
-        // If you're querying by ID, ignore the sub-site - this is a bit ugly... (but it was WAYYYYYYYYY worse)
-        // @TODO I don't think excluding if SiteTree_ImageTracking is a good idea however because of the SS 3.0 api and
-        // ManyManyList::removeAll() changing the from table after this function is called there isn't much of a choice
-
         $from = $query->getFrom();
         if (isset($from['SiteTree_ImageTracking']) || $query->filtersOnID()) {
             return;
diff --git a/src/Extensions/SiteTreeSubsites.php b/src/Extensions/SiteTreeSubsites.php
index 5e4ce003..760eba07 100644
--- a/src/Extensions/SiteTreeSubsites.php
+++ b/src/Extensions/SiteTreeSubsites.php
@@ -140,9 +140,6 @@ public function updateCMSFields(FieldList $fields)
             );
 
             $copyAction->addExtraClass('btn btn-primary font-icon-save ml-3');
-
-            // @todo check if this needs re-implementation
-//            $copyAction->includeDefaultJS(false);
         }
 
         // replace readonly link prefix
diff --git a/src/Forms/GridFieldSubsiteDetailFormItemRequest.php b/src/Forms/GridFieldSubsiteDetailFormItemRequest.php
index f6775aa3..f5591c12 100644
--- a/src/Forms/GridFieldSubsiteDetailFormItemRequest.php
+++ b/src/Forms/GridFieldSubsiteDetailFormItemRequest.php
@@ -18,10 +18,6 @@ class GridFieldSubsiteDetailFormItemRequest extends GridFieldDetailForm_ItemRequ
      * Builds an item edit form.  The arguments to getCMSFields() are the popupController and
      * popupFormName, however this is an experimental API and may change.
      *
-     * @todo In the future, we will probably need to come up with a tigher object representing a partially
-     * complete controller with gaps for extra functionality.  This, for example, would be a better way
-     * of letting Security/login put its log-in form inside a UI specified elsewhere.
-     *
      * @return Form
      * @see GridFieldDetailForm_ItemRequest::ItemEditForm()
      */
diff --git a/src/Model/Subsite.php b/src/Model/Subsite.php
index d32b0b44..f350bd0a 100644
--- a/src/Model/Subsite.php
+++ b/src/Model/Subsite.php
@@ -583,8 +583,6 @@ public static function writeHostMap($file = null)
      * If more than one permission is passed to the method, at least one of them must
      * be granted for if to return TRUE.
      *
-     * @todo Allow permission inheritance through group hierarchy.
-     *
      * @param Member Member to check against. Defaults to currently logged in member
      * @param array $permissionCodes
      * @return bool
diff --git a/src/Model/SubsiteDomain.php b/src/Model/SubsiteDomain.php
index 2d938915..843f3db3 100644
--- a/src/Model/SubsiteDomain.php
+++ b/src/Model/SubsiteDomain.php
@@ -180,8 +180,6 @@ public function getFullProtocol()
     /**
      * Retrieves domain name with wildcards substituted with actual values
      *
-     * @todo Refactor domains into separate wildcards / primary domains
-     *
      * @return string
      */
     public function getSubstitutedDomain()
@@ -193,7 +191,6 @@ public function getSubstitutedDomain()
         $domain = preg_replace('/\.\*$/', ".{$currentHost}", $this->Domain ?? '');
 
         // Default to "subsite." prefix for first wildcard
-        // TODO Whats the significance of "subsite" in this context?!
         $domain = preg_replace('/^\*\./', "subsite.", $domain ?? '');
 
         // *Only* removes "intermediate" subdomains, so 'subdomain.www.domain.com' becomes 'subdomain.domain.com'