diff --git a/www/code/main.js b/www/code/main.js
index 88089766c..8127cb566 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -715,7 +715,6 @@ define([
 
         var second = function (CM) {
             Cryptpad.ready(function (err, env) {
-                // TODO handle error
                 andThen(CM);
             });
             Cryptpad.onError(function (info) {
@@ -728,7 +727,6 @@ define([
         var first = function () {
             if (ifrw.CodeMirror) {
                 // it exists, call your continuation
-                //andThen(ifrw.CodeMirror);
                 second(ifrw.CodeMirror);
             } else {
                 console.log("CodeMirror was not defined. Trying again in %sms", interval);
diff --git a/www/drive/main.js b/www/drive/main.js
index 15f3e5a01..3ff8ee111 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1403,7 +1403,7 @@ define([
                     onElementClick(e, $element);
                 });
                 $element.contextmenu(openDefaultContextMenu);
-                $element.data('context', $defaultContextMenu); // TODO: hide the "delete" link in that context menu
+                $element.data('context', $defaultContextMenu);
                 $container.append($element);
             });
         };
diff --git a/www/pad/main.js b/www/pad/main.js
index 13abcd863..ef8443685 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -734,7 +734,6 @@ define([
                 console.log("Aborting the session!");
                 // stop the user from continuing to edit
                 setEditable(false);
-                // TODO inform them that the session was torn down
                 toolbar.failed();
                 Cryptpad.alert(Messages.common_connectionLost, undefined, true);
             };
@@ -797,7 +796,6 @@ define([
     var interval = 100;
     var second = function (Ckeditor) {
         Cryptpad.ready(function (err, env) {
-            // TODO handle error
             andThen(Ckeditor);
         });
         Cryptpad.onError(function (info) {
@@ -810,7 +808,6 @@ define([
     var first = function () {
         Ckeditor = ifrw.CKEDITOR;
         if (Ckeditor) {
-            //andThen(Ckeditor);
             // mobile configuration
             Ckeditor.config.toolbarCanCollapse = true;
             Ckeditor.config.height = '72vh';
diff --git a/www/poll/main.js b/www/poll/main.js
index a3bef9a9b..70c117055 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -500,7 +500,6 @@ define([
     };
 
     // special UI elements
-    //var $title = $('#title').attr('placeholder', Messages.poll_titleHint || 'title'); TODO
     var $description = $('#description').attr('placeholder', Messages.poll_descriptionHint || 'description');
 
     var ready = function (info, userid, readOnly) {
diff --git a/www/slide/main.js b/www/slide/main.js
index b0b9ba3a3..38c9354c0 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -646,7 +646,7 @@ define([
                     });
                     var $testColor = $('<input>', { type: 'color', value: '!' });
                     var $check = $pad.contents().find("#colorPicker_check");
-                    if ($testColor.attr('type') !== "color" || $testColor.val() === '!') { return; } // TODO
+                    if ($testColor.attr('type') !== "color" || $testColor.val() === '!') { return; }
                     $back.on('click', function() {
                         var $picker = $('<input>', { type: 'color', value: backColor })
                             .css({ display: 'none', })
@@ -908,7 +908,6 @@ define([
 
         var second = function (CM) {
             Cryptpad.ready(function (err, env) {
-                // TODO handle error
                 andThen(CM);
             });
             Cryptpad.onError(function (info) {
@@ -921,7 +920,6 @@ define([
         var first = function () {
             if (ifrw.CodeMirror) {
                 // it exists, call your continuation
-                //andThen(ifrw.CodeMirror);
                 second(ifrw.CodeMirror);
             } else {
                 console.log("CodeMirror was not defined. Trying again in %sms", interval);