diff --git a/package-lock.json b/package-lock.json
index 01c97990d..b7f88aad2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6292,12 +6292,6 @@
 				"mime-types": "^2.1.12"
 			}
 		},
-		"formdata-polyfill": {
-			"version": "3.0.18",
-			"resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-3.0.18.tgz",
-			"integrity": "sha512-qydEiPA/DWm1reRCfBJyFHs/wQhjvjoQjN8P/FatoaZJ+Efc/1kVwrHPR7Ek+BuIGINr26mHXT9KpR5WYmWZww==",
-			"dev": true
-		},
 		"forwarded": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -17148,13 +17142,13 @@
 			"dev": true
 		},
 		"twemoji": {
-			"version": "12.1.4",
-			"resolved": "https://registry.npmjs.org/twemoji/-/twemoji-12.1.4.tgz",
-			"integrity": "sha512-e37lUlVijmABF7wPCc09s1kKj3hcpzU8KL5zw2bBDIXOtOr4luLF+ODJaEqca8dZPmLR5ezrJYI93nhPovKBiQ==",
+			"version": "12.1.5",
+			"resolved": "https://registry.npmjs.org/twemoji/-/twemoji-12.1.5.tgz",
+			"integrity": "sha512-B0PBVy5xomwb1M/WZxf/IqPZfnoIYy1skXnlHjMwLwTNfZ9ljh8VgWQktAPcJXu8080WoEh6YwQGPVhDVqvrVQ==",
 			"requires": {
 				"fs-extra": "^8.0.1",
 				"jsonfile": "^5.0.0",
-				"twemoji-parser": "12.1.1",
+				"twemoji-parser": "12.1.3",
 				"universalify": "^0.1.2"
 			},
 			"dependencies": {
@@ -17170,9 +17164,9 @@
 			}
 		},
 		"twemoji-parser": {
-			"version": "12.1.1",
-			"resolved": "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-12.1.1.tgz",
-			"integrity": "sha512-XFUB4ReEvPbNPtiuyo/+crM4RldYbRRAhyE7Hw6EnfBdXECGydw7a49EGADayRvaeierP/m4DSv/OZQObh0LGA=="
+			"version": "12.1.3",
+			"resolved": "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-12.1.3.tgz",
+			"integrity": "sha512-ND4LZXF4X92/PFrzSgGkq6KPPg8swy/U0yRw1k/+izWRVmq1HYi3khPwV3XIB6FRudgVICAaBhJfW8e8G3HC7Q=="
 		},
 		"type-check": {
 			"version": "0.3.2",
diff --git a/package.json b/package.json
index 67c9181ed..399608aa9 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,6 @@
     "exports-loader": "^0.7.0",
     "fast-text-encoding": "^1.0.0",
     "file-loader": "^4.0.0",
-    "formdata-polyfill": "^3.0.18",
     "html-webpack-plugin": "^3.2.0",
     "http-server": "^0.11.1",
     "imports-loader": "^0.8.0",
diff --git a/src/converse-controlbox.js b/src/converse-controlbox.js
index c4dc23c1b..a07e1268f 100644
--- a/src/converse-controlbox.js
+++ b/src/converse-controlbox.js
@@ -4,7 +4,6 @@
  * @license Mozilla Public License (MPLv2)
  */
 import "converse-chatview";
-import "formdata-polyfill";
 import { get } from "lodash";
 import { Model } from 'skeletor.js/src/model.js';
 import { View } from "skeletor.js/src/view";
diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js
index 10298ed8d..75fda97f0 100644
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -5,7 +5,6 @@
  * @license Mozilla Public License (MPLv2)
  */
 import "converse-modal";
-import "formdata-polyfill";
 import "@converse/headless/utils/muc";
 import { get, head, isString, isUndefined } from "lodash";
 import { View } from 'skeletor.js/src/view.js';
diff --git a/src/converse-profile.js b/src/converse-profile.js
index ecfa2810e..641d515e8 100644
--- a/src/converse-profile.js
+++ b/src/converse-profile.js
@@ -6,7 +6,6 @@
 import "@converse/headless/converse-status";
 import "@converse/headless/converse-vcard";
 import "converse-modal";
-import "formdata-polyfill";
 import bootstrap from "bootstrap.native";
 import converse from "@converse/headless/converse-core";
 import log from "@converse/headless/log";
diff --git a/src/converse-rosterview.js b/src/converse-rosterview.js
index 871fbba26..e74e27556 100644
--- a/src/converse-rosterview.js
+++ b/src/converse-rosterview.js
@@ -6,7 +6,6 @@
 import "@converse/headless/converse-chatboxes";
 import "@converse/headless/converse-roster";
 import "converse-modal";
-import "formdata-polyfill";
 import { compact, debounce, has, isString, uniq, without } from "lodash";
 import { View } from 'skeletor.js/src/view.js';
 import { Model } from 'skeletor.js/src/model.js';
diff --git a/tests/utils.js b/tests/utils.js
index 93d7a9764..5efc7787d 100644
--- a/tests/utils.js
+++ b/tests/utils.js
@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(['es6-promise',  'mock'], factory);
-}(this, function (Promise, mock) {
+    define(['mock'], factory);
+}(this, function (mock) {
     const _ = converse.env._;
     const $msg = converse.env.$msg;
     const $pres = converse.env.$pres;
diff --git a/webpack.nodeps.js b/webpack.nodeps.js
index 1387e4d9e..b0c60218c 100644
--- a/webpack.nodeps.js
+++ b/webpack.nodeps.js
@@ -47,13 +47,6 @@ module.exports = merge(common, {
         }]
     },
     externals: [{
-        "backbone": "backbone",
-        "backbone.nativeview": "backbone.nativeview",
-        "backbone.vdomview": "backbone.vdomview",
-        "backbone.browserStorage": "backbone.browserStorage",
-        "backbone.overview": "backbone.overview",
-        "es6-promise": "es6-promise",
-        "formdata-polyfill": "formdata-polyfill",
         "lodash": "lodash",
         "lodash.noconflict": "lodash.noconflict",
         "strophe": "strophe",