diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
index c17743783309..26fd6fd3de75 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -169,10 +169,6 @@ var whitelist = [
   {file: "chrome://devtools/skin/images/aboutdebugging-firefox-release.svg",
    isFromDevTools: true},
   {file: "chrome://devtools/skin/images/next.svg", isFromDevTools: true},
-  // Feature gates are available but not used yet - Bug 1479127
-  {file: "resource://gre-resources/featuregates/FeatureGate.jsm"},
-  {file: "resource://gre-resources/featuregates/FeatureGateImplementation.jsm"},
-  {file: "resource://gre-resources/featuregates/feature_definitions.json"},
   // kvstore.jsm wraps the API in nsIKeyValue.idl in a more ergonomic API
   // It landed in bug 1490496, and we expect to start using it shortly.
   {file: "resource://gre/modules/kvstore.jsm"},
diff --git a/toolkit/components/featuregates/Features.toml b/toolkit/components/featuregates/Features.toml
index ceddd578dc36..6317d245ca71 100644
--- a/toolkit/components/featuregates/Features.toml
+++ b/toolkit/components/featuregates/Features.toml
@@ -1,13 +1,3 @@
-[demo-feature]
-title = "Demo Feature"
-description = "A no-op feature to demo the feature gate system."
-restart-required = false
-preference = "foo.bar.baz"
-type = "boolean"
-bug-numbers = [1479127]
-is-public = true
-default-value = false
-
 [normandy-remote-settings]
 title = "Normandy: Remote Settings transport"
 description = """
diff --git a/toolkit/components/featuregates/jar.mn b/toolkit/components/featuregates/jar.mn
index aa29dcd16d8c..3e54d92f1660 100644
--- a/toolkit/components/featuregates/jar.mn
+++ b/toolkit/components/featuregates/jar.mn
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 toolkit.jar:
-% resource featuregates %res/featuregates/
-  res/featuregates/FeatureGate.jsm (./FeatureGate.jsm)
-  res/featuregates/FeatureGateImplementation.jsm (./FeatureGateImplementation.jsm)
-  res/featuregates/feature_definitions.json (./feature_definitions.json)
+% resource featuregates %featuregates/
+  featuregates/FeatureGate.jsm (./FeatureGate.jsm)
+  featuregates/FeatureGateImplementation.jsm (./FeatureGateImplementation.jsm)
+  featuregates/feature_definitions.json (./feature_definitions.json)