diff --git a/common/content/browser.js b/common/content/browser.js
index 9e9ae0af..cd5f6a72 100644
--- a/common/content/browser.js
+++ b/common/content/browser.js
@@ -13,7 +13,6 @@
  */
 const Browser = Module("browser", {
 }, {
-    // TODO: support 'nrformats'? -> probably not worth it --mst
     incrementURL: function (count) {
         let matches = buffer.URL.match(/(.*?)(\d+)(\D*)$/);
         dactyl.assert(matches);
@@ -122,10 +121,8 @@ const Browser = Module("browser", {
                     }
                 }
 
-                if (count < 1)
-                    count = 1;
+                count = Math.max(count, 1);
 
-                // XXX
                 let url = buffer.URL;
                 for (let i = 0; i < count; i++) {
                     if (isDirectory(url))
diff --git a/common/content/commandline.js b/common/content/commandline.js
index 95388bac..b1cf3b8f 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -548,7 +548,6 @@ const CommandLine = Module("commandline", {
      * @param {string} str
      * @param {string} highlightGroup
      */
-    // TODO: resize upon a window resize
     _echoMultiline: function echoMultiline(str, highlightGroup) {
         let doc = this.widgets.multilineOutput.contentDocument;
         let win = this.widgets.multilineOutput.contentWindow;
diff --git a/common/content/commands.js b/common/content/commands.js
index 014fa7fd..bf9f8207 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -38,7 +38,6 @@ CommandOption.defaultValue("description", function () "");
 CommandOption.defaultValue("type", function () CommandOption.NOARG);
 CommandOption.defaultValue("multiple", function () false);
 update(CommandOption, {
-    // FIXME: remove later, when our option handler is better
     /**
      * @property {number} The option argument is unspecified. Any argument
      *     is accepted and caller is responsible for parsing the return
diff --git a/common/content/configbase.js b/common/content/configbase.js
index 9da312b6..d316ac5b 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -100,7 +100,7 @@ const ConfigBase = Class(ModuleBase, {
      * @property {Object} A map between key names for key events should be ignored,
      *     and a mask of the modes in which they should be ignored.
      */
-    ignoreKeys: {}, // XXX: be aware you can't put useful values in here, as "modes.NORMAL" etc. are not defined at this time
+    ignoreKeys: {}, // NOTE: be aware you can't put useful values in here, as "modes.NORMAL" etc. are not defined at this time
 
     /**
      * @property {string} The ID of the application's main XUL window.
diff --git a/common/content/finder.js b/common/content/finder.js
index d3182b7e..afa56cfa 100644
--- a/common/content/finder.js
+++ b/common/content/finder.js
@@ -121,7 +121,6 @@ const RangeFinder = Module("rangefinder", {
     // Called when the search is canceled - for example if someone presses
     // escape while typing a search
     onCancel: function () {
-        // TODO: code to reposition the document to the place before search started
         if (this.rangeFind)
             this.rangeFind.cancel();
     },
@@ -154,11 +153,9 @@ const RangeFinder = Module("rangefinder", {
         modes.addMode("FIND_BACKWARD", true);
     },
     commandline: function () {
-        // Event handlers for search - closure is needed
         commandline.registerCallback("change", modes.FIND_FORWARD, this.closure.onKeyPress);
         commandline.registerCallback("submit", modes.FIND_FORWARD, this.closure.onSubmit);
         commandline.registerCallback("cancel", modes.FIND_FORWARD, this.closure.onCancel);
-        // TODO: allow advanced myModes in register/triggerCallback
         commandline.registerCallback("change", modes.FIND_BACKWARD, this.closure.onKeyPress);
         commandline.registerCallback("submit", modes.FIND_BACKWARD, this.closure.onSubmit);
         commandline.registerCallback("cancel", modes.FIND_BACKWARD, this.closure.onCancel);
diff --git a/common/content/hints.js b/common/content/hints.js
index 762c68c1..b78b1a26 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -914,18 +914,6 @@ const Hints = Module("hints", {
             this._processHints(followFirst);
         }
     }
-
-    // FIXME: add resize support
-    // window.addEventListener("resize", onResize, null);
-
-    // function onResize(event)
-    // {
-    //     if (event)
-    //         doc = event.originalTarget;
-    //     else
-    //         doc = window.content.document;
-    // }
-
     //}}}
 }, {
     translitTable: Class.memoize(function () {
diff --git a/common/content/history.js b/common/content/history.js
index e1b5d475..aa4a6f3e 100644
--- a/common/content/history.js
+++ b/common/content/history.js
@@ -55,7 +55,6 @@ const History = Module("history", {
         return obj;
     },
 
-    // TODO: better names
     stepTo: function stepTo(steps) {
         let start = 0;
         let end = window.getWebNavigation().sessionHistory.count - 1;
diff --git a/common/content/options.js b/common/content/options.js
index 05032c13..58ff5371 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -1150,7 +1150,6 @@ const Options = Module("options", {
                         if (options["verbose"] > 0 && option.setFrom)
                             msg += "\n        Last set from " + option.setFrom.path;
 
-                        // FIXME: Message highlight group wrapping messes up the indent up for multi-arg verbose :set queries
                         dactyl.echo(<span highlight="CmdOutput">{msg}</span>);
                     }
                 }