diff --git a/_config/extensions.yml b/_config/extensions.yml
index 98a7278..b37ecc8 100644
--- a/_config/extensions.yml
+++ b/_config/extensions.yml
@@ -1,12 +1,6 @@
 ---
 Name: cwpcoreextensions
 ---
-# @todo Disable the feature. LoginAttempt seems to be broken on bridging solution - logs every
-# request instead of logins!
-# Follow up issue: https://github.com/silverstripe/cwp-core/issues/41
-# SilverStripe\Admin\LeftAndMain:
-#   extensions:
-#     - CWP\Core\Extension\LoginAttemptNotifications
 
 SilverStripe\ORM\FieldType\DBField:
   extensions:
@@ -16,7 +10,6 @@ SilverStripe\Security\Group:
   extensions:
     - CWP\Core\Extension\CwpHtmlEditorConfig
 
-# @todo investigate replacement for this
 HtmlEditorField_Toolbar:
   extensions:
    - CWP\Core\Extension\CustomHtmlEditorFieldToolbar
diff --git a/src/Extension/CustomHtmlEditorField.php b/src/Extension/CustomHtmlEditorField.php
index 994c8b6..4e88700 100644
--- a/src/Extension/CustomHtmlEditorField.php
+++ b/src/Extension/CustomHtmlEditorField.php
@@ -6,10 +6,6 @@
 use SilverStripe\Forms\Form;
 use SilverStripe\View\Requirements;
 
-/**
- * @todo rename file to match class name
- * @todo investigate updated HTMLEditorField_Toolbar changes, and find new implementation
- */
 class CustomHtmlEditorFieldToolbar extends Extension
 {
 
diff --git a/src/Extension/LoginAttemptNotifications.php b/src/Extension/LoginAttemptNotifications.php
index 796b30d..6f1c78b 100644
--- a/src/Extension/LoginAttemptNotifications.php
+++ b/src/Extension/LoginAttemptNotifications.php
@@ -10,8 +10,6 @@
 use SilverStripe\View\Requirements;
 
 /**
- * TODO: describe.
- * TODO: bug when using default admin - always shows the message...
  * Requires Security::login_recording config to be set to true.
  *
  * @property LeftAndMain $owner
@@ -69,14 +67,12 @@ public function init()
 
                     $message .= "The attempts were from " . implode(', ', $IPs) . '. ';
 
-                    // TODO: add this call to action in a way that doesn't break out of the availabel space. Fix CSS?
-                    // $message .= "If you suspect somebody else might be trying to access
-                    //  . "your account, please contact support.";
+                    $message .= "If you suspect somebody else might be trying to access "
+                    . "your account, please contact support.";
                 }
             }
         } else {
             // New session - show last login attempt.
-            // TODO: this currently does NOT surface to the frontend in any way.
             $lastLoginAttempt = LoginAttempt::get()->filter([
                         'MemberID' => $member->ID
             ])->sort('Created DESC')->First();
diff --git a/src/Feed/CwpAtomFeed.php b/src/Feed/CwpAtomFeed.php
index 029e806..a2997a3 100644
--- a/src/Feed/CwpAtomFeed.php
+++ b/src/Feed/CwpAtomFeed.php
@@ -6,7 +6,6 @@
  * CwpAtomFeed class
  *
  * This class is used to create an Atom feed.
- * @todo Improve documentation
  * @package cwp-core
  */
 use SilverStripe\Control\Controller;