diff --git a/src/converse.js b/src/converse.js
index 6c4db03b8..2e72d2352 100644
--- a/src/converse.js
+++ b/src/converse.js
@@ -1,35 +1,29 @@
-/*global define */
-if (typeof define !== 'undefined') {
-    // The section below determines which plugins will be included in a build
-    define([
-        "@converse/headless/converse-core",
-        /* START: Removable components
-         * --------------------
-         * Any of the following components may be removed if they're not needed.
-         */
-        "converse-autocomplete",
-        "converse-bookmarks",       // XEP-0048 Bookmarks
-        "converse-caps",            // XEP-0115 Entity Capabilities
-        "converse-chatview",        // Renders standalone chat boxes for single user chat
-        "converse-controlbox",      // The control box
-        "converse-dragresize",      // Allows chat boxes to be resized by dragging them
-        "converse-embedded",
-        "converse-fullscreen",
-        "converse-push",            // XEP-0357 Push Notifications
-        "converse-headline",        // Support for headline messages
-        "@converse/headless/converse-mam",             // XEP-0313 Message Archive Management
-        "converse-minimize",        // Allows chat boxes to be minimized
-        "@converse/headless/converse-muc",             // XEP-0045 Multi-user chat
-        "converse-muc-views",       // Views related to MUC
-        "converse-notification",    // HTML5 Notifications
-        "converse-omemo",
-        "@converse/headless/converse-ping",            // XEP-0199 XMPP Ping
-        "converse-register",        // XEP-0077 In-band registration
-        "converse-roomslist",       // Show currently open chat rooms
-        "converse-roster",
-        "@converse/headless/converse-vcard",           // XEP-0054 VCard-temp
-        /* END: Removable components */
-    ], function (converse) {
-        return converse;
-    });
-}
+/* START: Removable components
+ * --------------------
+ * Any of the following components may be removed if they're not needed.
+ */
+import "converse-autocomplete";
+import "converse-bookmarks";       // XEP-0048 Bookmarks
+import "converse-caps";            // XEP-0115 Entity Capabilities
+import "converse-chatview";        // Renders standalone chat boxes for single user chat
+import "converse-controlbox";      // The control box
+import "converse-dragresize";      // Allows chat boxes to be resized by dragging them
+import "converse-embedded";
+import "converse-fullscreen";
+import "converse-push";            // XEP-0357 Push Notifications
+import "converse-headline";        // Support for headline messages
+import "@converse/headless/converse-mam";             // XEP-0313 Message Archive Management
+import "converse-minimize";        // Allows chat boxes to be minimized
+import "@converse/headless/converse-muc";             // XEP-0045 Multi-user chat
+import "converse-muc-views";       // Views related to MUC
+import "converse-notification";    // HTML5 Notifications
+import "converse-omemo";
+import "@converse/headless/converse-ping";            // XEP-0199 XMPP Ping
+import "converse-register";        // XEP-0077 In-band registration
+import "converse-roomslist";       // Show currently open chat rooms
+import "converse-roster";
+import "@converse/headless/converse-vcard";           // XEP-0054 VCard-temp
+/* END: Removable components */
+
+import converse from "@converse/headless/converse-core";
+export default converse;
diff --git a/src/end-no-dependencies.frag b/src/end-no-dependencies.frag
deleted file mode 100644
index 59fa81bd2..000000000
--- a/src/end-no-dependencies.frag
+++ /dev/null
@@ -1,52 +0,0 @@
-
-    define('awesomplete', [], function () { return Awesomplete; });
-    define('lodash', [], function () { return _; });
-    define('underscore', [], function () { return _; });
-    define('lodash.converter', [], function () { return fp; });
-    define('lodash.noconflict', [], function () { return _; });
-    define('moment', [], function () { return moment; });
-    define('moment/locale/af', [], function () { return moment; });
-    define('moment/locale/ca', [], function () { return moment; });
-    define('moment/locale/de', [], function () { return moment; });
-    define('moment/locale/es', [], function () { return moment; });
-    define('moment/locale/fr', [], function () { return moment; });
-    define('moment/locale/he', [], function () { return moment; });
-    define('moment/locale/hu', [], function () { return moment; });
-    define('moment/locale/id', [], function () { return moment; });
-    define('moment/locale/it', [], function () { return moment; });
-    define('moment/locale/ja', [], function () { return moment; });
-    define('moment/locale/nb', [], function () { return moment; });
-    define('moment/locale/nl', [], function () { return moment; });
-    define('moment/locale/pl', [], function () { return moment; });
-    define('moment/locale/pt-br', [], function () { return moment; });
-    define('moment/locale/ru', [], function () { return moment; });
-    define('moment/locale/uk', [], function () { return moment; });
-    define('moment/moment', [], function () { return moment; });
-    define('i18n', [], function () { return; });
-    define('es6-promise/dist/es6-promise.auto', [], function () { return Promise; });
-
-    define('strophe', [], function () {
-        return {
-            'Strophe':         Strophe,
-            '$build':          $build,
-            '$iq':             $iq,
-            '$msg':            $msg,
-            '$pres':           $pres,
-            'SHA1':            SHA1,
-            'MD5':             MD5,
-            'b64_hmac_sha1':   SHA1.b64_hmac_sha1,
-            'b64_sha1':        SHA1.b64_sha1,
-            'str_hmac_sha1':   SHA1.str_hmac_sha1,
-            'str_sha1':        SHA1.str_sha1
-        };
-    });
-    var strophePlugin = function () { return Strophe; };
-    var emptyFunction = function () { };
-    define('strophe.ping', ['strophe'], strophePlugin);
-    define('strophe.rsm', ['strophe'], strophePlugin);
-    define('backbone', [], function () { return Backbone; });
-    define('backbone.noconflict', [], function () { return Backbone; });
-    define('backbone.browserStorage', ['backbone'], emptyFunction);
-    define('backbone.overview', ['backbone'], emptyFunction);
-    return require('converse');
-}));
diff --git a/src/end-no-jquery.frag b/src/end-no-jquery.frag
deleted file mode 100644
index 9f92b4633..000000000
--- a/src/end-no-jquery.frag
+++ /dev/null
@@ -1,4 +0,0 @@
-    define('jquery', [], function () { return jQuery; });
-    define('jquery.noconflict', [], function () { return jQuery; });
-    return require('converse');
-}));
diff --git a/src/jquery.noconflict.js b/src/jquery.noconflict.js
deleted file mode 100644
index 3af8c7dea..000000000
--- a/src/jquery.noconflict.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*global define */
-define(['jquery'], function (jq) {
-    return jq.noConflict( true );
-});