diff --git a/platform/chromium/vapi-popup.js b/platform/chromium/vapi-popup.js
deleted file mode 100644
index 8566e4320..000000000
--- a/platform/chromium/vapi-popup.js
+++ /dev/null
@@ -1 +0,0 @@
-/* Chromium: no platform-specific code */
\ No newline at end of file
diff --git a/platform/firefox/vapi-polyfill.js b/platform/firefox/vapi-polyfill.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/platform/firefox/vapi-popup.js b/platform/firefox/vapi-popup.js
deleted file mode 100644
index 73250bb2c..000000000
--- a/platform/firefox/vapi-popup.js
+++ /dev/null
@@ -1 +0,0 @@
-/* Firefox: no platform-specific code */
\ No newline at end of file
diff --git a/src/popup.html b/src/popup.html
index 97a110a2f..ce11b711b 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -55,7 +55,6 @@
-
diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
index 927909af7..81a278c39 100755
--- a/tools/make-firefox.sh
+++ b/tools/make-firefox.sh
@@ -16,6 +16,10 @@ cp -R src/js $DES/
cp -R src/lib $DES/
cp -R src/_locales $DES/
cp src/*.html $DES/
+
+# AMO review feedback: avoid "unnecessary files or folders" in package
+cat src/background.html | sed -e '/vapi-polyfill\.js/d' > $DES/background.html
+
mv $DES/img/icon_128.png $DES/icon.png
cp platform/firefox/css/* $DES/css/
cp platform/firefox/vapi-*.js $DES/js/