diff --git a/lib/actions/sessions.js b/lib/actions/sessions.js
index ffab7d9c..7cdf690c 100644
--- a/lib/actions/sessions.js
+++ b/lib/actions/sessions.js
@@ -108,7 +108,7 @@ export function setActiveSession(uid) {
       type: SESSION_SET_ACTIVE,
       uid,
       effect() {
-        // TODO: this goes away when we are able to poll
+        // This goes away when we are able to poll
         // for the title ourseleves, instead of relying
         // on Session and focus/blur to subscribe
         if (prevUid) {
diff --git a/lib/actions/ui.js b/lib/actions/ui.js
index 1188bf6d..7e9ab35f 100644
--- a/lib/actions/ui.js
+++ b/lib/actions/ui.js
@@ -207,7 +207,7 @@ export function showPreferences() {
       type: UI_SHOW_PREFERENCES,
       effect() {
         dispatch(requestSession());
-        // TODO: replace this hack with an async action
+        // Replace this hack with an async action
         rpc.once('session add', ({uid}) => {
           rpc.once('session data', () => {
             dispatch(sendSessionData(
diff --git a/lib/components/term-group.js b/lib/components/term-group.js
index 5d841abe..c1affeca 100644
--- a/lib/components/term-group.js
+++ b/lib/components/term-group.js
@@ -74,7 +74,7 @@ class TermGroup_ extends Component {
       onURLAbort: this.bind(this.props.onURLAbort, null, uid)
     });
 
-    // TODO: This will create a new ref_ function for every render,
+    // This will create a new ref_ function for every render,
     // which is inefficient. Should maybe do something similar
     // to this.bind.
     return (<Term
diff --git a/lib/components/term.js b/lib/components/term.js
index 843e704b..809e217f 100644
--- a/lib/components/term.js
+++ b/lib/components/term.js
@@ -114,7 +114,7 @@ export default class Term extends Component {
   }
 
   handleFocus() {
-    // TODO: This will in turn result in `this.focus()` being
+    // This will in turn result in `this.focus()` being
     // called, which is unecessary.
     // Should investigate if it matters.
     this.props.onActive();
diff --git a/lib/reducers/ui.js b/lib/reducers/ui.js
index 6e2ca4b3..3566aae1 100644
--- a/lib/reducers/ui.js
+++ b/lib/reducers/ui.js
@@ -23,7 +23,7 @@ import {values} from '../utils/object';
 const allowedCursorShapes = new Set(['BEAM', 'BLOCK', 'UNDERLINE']);
 const allowedBells = new Set(['SOUND', false]);
 
-// TODO: populate `config-default.js` from this :)
+// Populate `config-default.js` from this :)
 const initial = Immutable({
   cols: null,
   rows: null,
diff --git a/package.json b/package.json
index 83bb1ccf..44c061aa 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
     ],
     "rules": {
       "new-cap": 0,
-      "no-warning-comments": 0,
       "complexity": 0,
       "react/prop-types": 0,
       "react/jsx-no-bind": 0