diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
index a82b7cb4de..c2d1b3fae5 100644
--- a/code/Controllers/CMSMain.php
+++ b/code/Controllers/CMSMain.php
@@ -80,8 +80,6 @@
  * This class creates a 2-frame layout - left-tree and right-form - to sit beneath the main
  * admin menu.
  *
- * @todo Create some base classes to contain the generic functionality that will be replicated.
- *
  * @mixin LeftAndMainPageIconsExtension
  */
 class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionProvider, Flushable, MemberCacheFlusher
diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php
index ac0107dfca..d8e8db9cf6 100644
--- a/code/Controllers/ContentController.php
+++ b/code/Controllers/ContentController.php
@@ -45,7 +45,6 @@
  * Subclasses of ContentController are generally instantiated by ModelAsController; this will create
  * a controller based on the URLSegment action variable, by looking in the SiteTree table.
  *
- * @todo Can this be used for anything other than SiteTree controllers?
  */
 class ContentController extends Controller
 {
@@ -303,8 +302,6 @@ public function Menu($level)
     /**
      * Returns the default log-in form.
      *
-     * @todo Check if here should be returned just the default log-in form or
-     *       all available log-in forms (also OpenID...)
      * @return \SilverStripe\Security\MemberAuthenticator\MemberLoginForm
      */
     public function LoginForm()
diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
index aaa06a9198..aefd7001c1 100755
--- a/code/Model/SiteTree.php
+++ b/code/Model/SiteTree.php
@@ -1958,7 +1958,6 @@ public function getLiveURLSegment()
      */
     public function BackLinkTracking()
     {
-        // @todo - Implement PolymorphicManyManyList to replace this
         $list = ArrayList::create();
 
         $siteTreelinkTable = SiteTreeLink::singleton()->baseTable();
diff --git a/code/Reports/BrokenFilesReport.php b/code/Reports/BrokenFilesReport.php
index 609428c328..2c4b3426ec 100644
--- a/code/Reports/BrokenFilesReport.php
+++ b/code/Reports/BrokenFilesReport.php
@@ -46,7 +46,7 @@ public function columns()
     {
         return [
             "Title" => [
-                "title" => "Title", // todo: use NestedTitle(2)
+                "title" => "Title",
                 "link" => true,
             ],
         ];
diff --git a/code/Reports/BrokenRedirectorPagesReport.php b/code/Reports/BrokenRedirectorPagesReport.php
index a1390d62fa..62b8086b04 100644
--- a/code/Reports/BrokenRedirectorPagesReport.php
+++ b/code/Reports/BrokenRedirectorPagesReport.php
@@ -39,7 +39,7 @@ public function columns()
     {
         return [
             "Title" => [
-                "title" => "Title", // todo: use NestedTitle(2)
+                "title" => "Title",
                 "link" => true,
             ],
         ];
diff --git a/code/Reports/BrokenVirtualPagesReport.php b/code/Reports/BrokenVirtualPagesReport.php
index f4cee18124..ed680fe897 100644
--- a/code/Reports/BrokenVirtualPagesReport.php
+++ b/code/Reports/BrokenVirtualPagesReport.php
@@ -39,7 +39,7 @@ public function columns()
     {
         return [
             "Title" => [
-                "title" => "Title", // todo: use NestedTitle(2)
+                "title" => "Title",
                 "link" => true,
             ],
         ];
diff --git a/code/Reports/EmptyPagesReport.php b/code/Reports/EmptyPagesReport.php
index 8c3a211c18..814e51835b 100644
--- a/code/Reports/EmptyPagesReport.php
+++ b/code/Reports/EmptyPagesReport.php
@@ -43,7 +43,7 @@ public function columns()
     {
         return [
             "Title" => [
-                "title" => "Title", // todo: use NestedTitle(2)
+                "title" => "Title",
                 "link" => true,
             ],
         ];
diff --git a/code/Reports/RecentlyEditedReport.php b/code/Reports/RecentlyEditedReport.php
index 8522834c70..a0216420c0 100644
--- a/code/Reports/RecentlyEditedReport.php
+++ b/code/Reports/RecentlyEditedReport.php
@@ -38,7 +38,7 @@ public function columns()
     {
         return [
             "Title" => [
-                "title" => "Title", // todo: use NestedTitle(2)
+                "title" => "Title",
                 "link" => true,
             ],
         ];
diff --git a/tests/php/Model/SiteTreePermissionsTest.php b/tests/php/Model/SiteTreePermissionsTest.php
index d3afc8d29e..2fdf721f2d 100644
--- a/tests/php/Model/SiteTreePermissionsTest.php
+++ b/tests/php/Model/SiteTreePermissionsTest.php
@@ -12,10 +12,6 @@
 use SilverStripe\Subsites\Extensions\SiteTreeSubsites;
 use SilverStripe\Versioned\Versioned;
 
-/**
- * @todo Test canAddChildren()
- * @todo Test canCreate()
- */
 class SiteTreePermissionsTest extends FunctionalTest
 {
     protected static $fixture_file = "SiteTreePermissionsTest.yml";
diff --git a/tests/php/Search/ZZZSearchFormTest.php b/tests/php/Search/ZZZSearchFormTest.php
index 585e16f8b4..35bed9a6e6 100644
--- a/tests/php/Search/ZZZSearchFormTest.php
+++ b/tests/php/Search/ZZZSearchFormTest.php
@@ -21,9 +21,6 @@
 use TractorCow\Fluent\Extension\FluentSiteTreeExtension;
 
 /**
- * @todo Fix unpublished pages check in testPublishedPagesMatchedByTitle()
- * @todo All tests run on unpublished pages at the moment, due to the searchform not distinguishing between them
- *
  * Because this manipulates the test database in severe ways, I've renamed the test to force it to run last...
  */
 class ZZZSearchFormTest extends FunctionalTest