diff --git a/src/index.js b/src/index.js
index 7a59f52e90..882834dd47 100755
--- a/src/index.js
+++ b/src/index.js
@@ -2,16 +2,8 @@
 
 import type { Options } from "./options";
 import Parser, { plugins } from "./parser";
-import "./parser/util";
-import "./parser/statement";
-import "./parser/lval";
-import "./parser/expression";
-import "./parser/node";
-import "./parser/location";
-import "./parser/comments";
 
 import { types as tokTypes } from "./tokenizer/types";
-import "./tokenizer";
 import "./tokenizer/context";
 
 import type { Expression, File } from "./types";
diff --git a/src/util/identifier.js b/src/util/identifier.js
index 1552410e23..c938eb9d5e 100644
--- a/src/util/identifier.js
+++ b/src/util/identifier.js
@@ -2,15 +2,6 @@
 
 // @flow
 
-// This is a trick taken from Esprima. It turns out that, on
-// non-Chrome browsers, to check whether a string is in a set, a
-// predicate containing a big ugly `switch` statement is faster than
-// a regular expression, and on Chrome the two are about on par.
-// This function uses `eval` (non-lexical) to produce such a
-// predicate from a space-separated string of words.
-//
-// It starts by sorting the words by length.
-
 function makePredicate(words: string): (str: string) => boolean {
   const wordsArr = words.split(" ");
   return function(str) {