diff --git a/src/ChangeSet.php b/src/ChangeSet.php
index feeaef67..980c1e2d 100644
--- a/src/ChangeSet.php
+++ b/src/ChangeSet.php
@@ -213,8 +213,6 @@ public function removeObject(DataObject $object)
         ])->first();
 
         if ($item) {
-            // TODO: Handle case of implicit added item being removed.
-
             $item->delete();
         }
 
diff --git a/src/DataDifferencer.php b/src/DataDifferencer.php
index 550b783e..7436f781 100644
--- a/src/DataDifferencer.php
+++ b/src/DataDifferencer.php
@@ -188,8 +188,6 @@ protected function getObjectDisplay($object = null)
         }
 
         // Use image tag
-        // TODO Use CMSThumbnail instead to limit max size, blocked by DataDifferencerTest and GC
-        // not playing nice with mocked images
         if ($object instanceof Image) {
             return $object->getTag();
         }
diff --git a/src/RecursivePublishable.php b/src/RecursivePublishable.php
index e02a19d0..ac4c223d 100644
--- a/src/RecursivePublishable.php
+++ b/src/RecursivePublishable.php
@@ -201,7 +201,6 @@ public function findOwners($recursive = true, $list = null)
         }
 
         // Build reverse lookup for ownership
-        // @todo - Cache this more intelligently
         $rules = $this->lookupReverseOwners();
 
         // Hand off to recursive method
diff --git a/src/RecursivePublishableHandler.php b/src/RecursivePublishableHandler.php
index 3f193a84..6171b6aa 100644
--- a/src/RecursivePublishableHandler.php
+++ b/src/RecursivePublishableHandler.php
@@ -12,7 +12,6 @@ class RecursivePublishableHandler extends Extension
 {
     /**
      * Ensure that non-versioned records are published on save.
-     * @todo Build this action into explicit UX action: https://github.com/silverstripe/silverstripe-versioned/issues/71
      * @param DataObject $record
      */
     public function onAfterSave(DataObject $record)
diff --git a/src/Versioned.php b/src/Versioned.php
index 6f28c515..8ffe981d 100644
--- a/src/Versioned.php
+++ b/src/Versioned.php
@@ -2021,7 +2021,6 @@ public function Versions($filter = "", $sort = "", $limit = "", $join = "", $hav
 
         $list = DataObject::get(DataObject::getSchema()->baseDataClass($owner), $filter, $sort, $join, $limit);
         if ($having) {
-            // @todo - This method doesn't exist on DataList
             $list->having($having);
         }
 
@@ -2656,8 +2655,6 @@ public static function get_latest_version($class, $id)
     /**
      * Returns whether the current record is the latest one.
      *
-     * @todo Performance - could do this directly via SQL.
-     *
      * @see get_latest_version()
      * @see latestPublished
      *
diff --git a/tests/php/DataDifferencerTest.php b/tests/php/DataDifferencerTest.php
index 54abd434..154ff36d 100644
--- a/tests/php/DataDifferencerTest.php
+++ b/tests/php/DataDifferencerTest.php
@@ -70,8 +70,7 @@ public function testArrayValues()
         $obj1v2 = Versioned::get_version(DataDifferencerTest\TestObject::class, $obj1->ID, $afterVersion);
         $differ = new DataDifferencer($obj1v1, $obj1v2);
         $obj1Diff = $differ->diffedData();
-        // TODO Using getter would split up field again, bug only caused by simulating
-        // an array-based value in the first place.
+
         $this->assertContainsIgnoreWhitespace('<del>a,b</del><ins>a</ins>', $obj1Diff->getField('Choices'));
     }