diff --git a/lib/Newsletter/Renderer/Renderer.php b/lib/Newsletter/Renderer/Renderer.php
index b2e6e76a54..147584bf14 100644
--- a/lib/Newsletter/Renderer/Renderer.php
+++ b/lib/Newsletter/Renderer/Renderer.php
@@ -19,7 +19,6 @@ class Renderer {
   const FILTER_POST_PROCESS = 'mailpoet_rendering_post_process';
 
   function __construct($newsletter, $preview = false) {
-    // TODO: remove ternary condition, refactor to use model objects
     $this->newsletter = (is_object($newsletter)) ? $newsletter->asArray() : $newsletter;
     $this->preview = $preview;
     $this->blocks_renderer = new Blocks\Renderer($this->newsletter, $this->preview);
@@ -210,4 +209,4 @@ class Renderer {
     );
     return $content;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/Subscription/Manage.php b/lib/Subscription/Manage.php
index 2778326a1d..36795dd69a 100644
--- a/lib/Subscription/Manage.php
+++ b/lib/Subscription/Manage.php
@@ -26,7 +26,6 @@ class Manage {
       }
     }
 
-    // TODO: success/error messages (not present in MP2)
     Url::redirectBack();
   }
-}
\ No newline at end of file
+}
diff --git a/tests/javascript/mochaTestHelper.js b/tests/javascript/mochaTestHelper.js
index 1af3f8e564..99773c538a 100644
--- a/tests/javascript/mochaTestHelper.js
+++ b/tests/javascript/mochaTestHelper.js
@@ -52,7 +52,6 @@ jQuery.fn.spectrum = global.spectrum;
 jQuery.fn.stick_in_parent = function () { return this; };
 
 // Add global stubs for convenience
-// TODO: Extract those to a separate file
 global.stubChannel = function (EditorApplication, returnObject) {
   var App = EditorApplication;
   App.getChannel = sinon.stub().returns(_.defaults(returnObject || {}, {
diff --git a/views/settings/basics.html b/views/settings/basics.html
index 5d112859f9..76056596c9 100644
--- a/views/settings/basics.html
+++ b/views/settings/basics.html
@@ -81,7 +81,6 @@
       </td>
     </tr>
     <!-- ability to subscribe in comments -->
-    <!-- TODO: Check if registration is enabled (if not, display a message and disable setting) -->
     <tr>
       <th scope="row">
         <label for="settings[subscribe_on_comment]">
@@ -140,8 +139,6 @@
       </td>
     </tr>
     <!-- ability to subscribe when registering -->
-    <!-- TODO: Only available for the main site of a multisite! -->
-    <!-- TODO: Check if registration is enabled (if not, display a message and disable setting) -->
     <tr>
       <th scope="row">
         <label for="settings[subscribe_on_register]">