diff --git a/package.json b/package.json
index 39252a29776b13494daf361821887e8fb504df49..dbd7cd21240366e1af848217dc2b5c4ebb95f1b0 100644
--- a/package.json
+++ b/package.json
@@ -11,11 +11,11 @@
     "url": "https://github.com/facebookincubator/create-react-app/issues"
   },
   "scripts": {
-    "build": "node scripts/build.js --debug-template",
+    "build": "node scripts/build.js",
     "create-react-app": "node global-cli/index.js --scripts-version \"$PWD/`tasks/clean_pack.sh`\"",
     "e2e": "tasks/e2e.sh",
-    "start": "node scripts/start.js --debug-template",
-    "test": "node scripts/test.js --debug-template --env=jsdom"
+    "start": "node scripts/start.js",
+    "test": "node scripts/test.js --env=jsdom"
   },
   "files": [
     "PATENTS",
diff --git a/scripts/start.js b/scripts/start.js
index 09e3a7f92488d8d3b14dcc7411416856f2e68696..9880330b1cea089dc897be21d5572ae243a5eb21 100644
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -27,10 +27,10 @@ var paths = require('../config/paths');
 // Tools like Cloud9 rely on this.
 var DEFAULT_PORT = process.env.PORT || 3000;
 var compiler;
-
-// TODO: hide this behind a flag and eliminate dead code on eject.
-// This shouldn't be exposed to the user.
 var handleCompile;
+
+// You can safely remove this after ejecting.
+// We only use this block for testing of Create React App itself:
 var isSmokeTest = process.argv.some(arg => arg.indexOf('--smoke-test') > -1);
 if (isSmokeTest) {
   handleCompile = function (err, stats) {
diff --git a/scripts/test.js b/scripts/test.js
index b8d047333ad95a248d6e32650236006e50d00e4e..d13aff38017a189f0e49ba3ca7b898ef1c64a3ed 100644
--- a/scripts/test.js
+++ b/scripts/test.js
@@ -16,12 +16,6 @@ const paths = require('../config/paths');
 
 const argv = process.argv.slice(2);
 
-// Don't pass this option to Jest
-const debugTemplateIndex = argv.indexOf('--debug-template');
-if (debugTemplateIndex !== -1) {
-  argv.splice(debugTemplateIndex, 1);
-}
-
 // Watch unless on CI
 if (!process.env.CI) {
   argv.push('--watch');