diff --git a/classes/announcement/Announcement.php b/classes/announcement/Announcement.php
index b075928fe23..9f865880b81 100644
--- a/classes/announcement/Announcement.php
+++ b/classes/announcement/Announcement.php
@@ -206,7 +206,6 @@ protected function scopeWithSearchPhrase(EloquentBuilder $builder, ?string $sear
 
     /**
      * Get the full title
-     * TODO temporary measure while AnnouncementType isn't refactored as Eloquent Model
      */
     protected function fullTitle(): Attribute
     {
diff --git a/classes/core/SettingsBuilder.php b/classes/core/SettingsBuilder.php
index f10466b65e4..b7b1a408375 100644
--- a/classes/core/SettingsBuilder.php
+++ b/classes/core/SettingsBuilder.php
@@ -67,7 +67,7 @@ public function update(array $values)
             $count = parent::update($primaryValues->toArray());
         }
 
-        // TODO Eloquent transforms attributes to snake case, find and override instead of transforming here
+        // FIXME pkp/pkp-lib#10485 Eloquent transforms attributes to snake case, find and override instead of transforming here
         $settingValues = $settingValues->mapWithKeys(
             fn (mixed $value, string $key) => [Str::camel($key) => $value]
         );
@@ -280,7 +280,6 @@ protected function getModelWithSettings(array|string $columns = ['*']): Collecti
 
     /**
      * If specific columns are selected to fill the Model with, iterate and filter all, which aren't specified
-     * TODO Instead of iterating through all row properties, we can force to pass primary key as a mandatory column?
      */
     protected function filterRow(stdClass $row, string|array $columns = ['*']): stdClass
     {