diff --git a/dev.html b/dev.html
index 49a89f98b..58c52a55a 100644
--- a/dev.html
+++ b/dev.html
@@ -14,8 +14,7 @@
     <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
     <script src="node_modules/requirejs/require.js"></script>
-    <script src="config.js"></script>
-    <script src="src/converse.js"></script>
+    <script src="src/config.js"></script>
 </head>
 
 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
@@ -66,11 +65,7 @@
             ],
             auto_reconnect: true,
             bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
-            keepalive: true,
-            message_carbons: true,
             message_archiving: 'always',
-            play_sounds: true,
-            roster_groups: true,
             show_controlbox_by_default: true,
             strict_plugin_dependencies: false,
             chatstate_notification_blacklist: ['mulles@movim.eu'],
diff --git a/index.html b/index.html
index 13276a514..38cf6ce07 100644
--- a/index.html
+++ b/index.html
@@ -208,46 +208,41 @@
 </body>
 
 <script>
-    require(['converse'], function (converse) {
-        (function () {
-            /* XXX: This function initializes jquery.easing for the https://conversejs.org
-            * website. This code is only useful in the context of the converse.js
-            * website and converse.js itself is NOT dependent on it.
-            */
-            var $ = converse.env.jQuery;
-            $.extend( $.easing, {
-                easeInOutExpo: function (x, t, b, c, d) {
-                    if (t==0) return b;
-                    if (t==d) return b+c;
-                    if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
-                    return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
-                },
-            });
-
-            $(window).scroll(function() {
-                if ($(".navbar").offset().top > 50) {
-                    $(".navbar-fixed-top").addClass("top-nav-collapse");
-                } else {
-                    $(".navbar-fixed-top").removeClass("top-nav-collapse");
-                }
-            });
-            //jQuery for page scrolling feature - requires jQuery Easing plugin
-            $('.page-scroll a').bind('click', function(event) {
-                var $anchor = $(this);
-                $('html, body').stop().animate({
-                    scrollTop: $($anchor.attr('href')).offset().top
-                }, 700, 'easeInOutExpo');
-                event.preventDefault();
-            });
-        })();
-        converse.initialize({
-            // Please use this connection manager only for testing purposes
-            bosh_service_url: 'https://conversejs.org/http-bind/',
-            message_carbons: true,
-            play_sounds: true,
-            roster_groups: true,
-            show_controlbox_by_default: true,
+    (function () {
+        /* XXX: This function initializes jquery.easing for the https://conversejs.org
+        * website. This code is only useful in the context of the converse.js
+        * website and converse.js itself is NOT dependent on it.
+        */
+        var $ = converse.env.jQuery;
+        $.extend( $.easing, {
+            easeInOutExpo: function (x, t, b, c, d) {
+                if (t==0) return b;
+                if (t==d) return b+c;
+                if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+                return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+            },
         });
+
+        $(window).scroll(function() {
+            if ($(".navbar").offset().top > 50) {
+                $(".navbar-fixed-top").addClass("top-nav-collapse");
+            } else {
+                $(".navbar-fixed-top").removeClass("top-nav-collapse");
+            }
+        });
+        //jQuery for page scrolling feature - requires jQuery Easing plugin
+        $('.page-scroll a').bind('click', function(event) {
+            var $anchor = $(this);
+            $('html, body').stop().animate({
+                scrollTop: $($anchor.attr('href')).offset().top
+            }, 700, 'easeInOutExpo');
+            event.preventDefault();
+        });
+    })();
+    converse.initialize({
+        // Please use this connection manager only for testing purposes
+        bosh_service_url: 'https://conversejs.org/http-bind/',
+        show_controlbox_by_default: true,
     });
 </script>
 </html>
diff --git a/src/converse-mobile.js b/src/converse-mobile.js
index dd1ecc86c..f3df8ba2d 100644
--- a/src/converse-mobile.js
+++ b/src/converse-mobile.js
@@ -24,13 +24,6 @@ if (typeof define !== 'undefined') {
         "converse-headline",    // Support for headline messages
         /* END: Removable components */
     ], function (converse) {
-        var evt;
-        if (window.CustomEvent) {
-            evt = new CustomEvent('converse-loaded', {detail: {'converse': converse}});
-        } else {
-            evt = document.createEvent('CustomEvent');
-            evt.initCustomEvent('converse-loaded', true, true, {'converse': converse});
-        }
-        window.dispatchEvent(evt);
+        return converse;
     });
 }
diff --git a/src/converse.js b/src/converse.js
index 6b23c257a..2693e0d4c 100755
--- a/src/converse.js
+++ b/src/converse.js
@@ -26,13 +26,6 @@ if (typeof define !== 'undefined') {
         "converse-headline",    // Support for headline messages
         /* END: Removable components */
     ], function (converse) {
-        var evt;
-        if (window.CustomEvent) {
-            evt = new CustomEvent('converse-loaded', {detail: {'converse': converse}});
-        } else {
-            evt = document.createEvent('CustomEvent');
-            evt.initCustomEvent('converse-loaded', true, true, {'converse': converse});
-        }
-        window.dispatchEvent(evt);
+        return converse;
     });
 }
diff --git a/tests.html b/tests.html
index db0c073b0..5578f64b7 100644
--- a/tests.html
+++ b/tests.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" media="screen" href="css/jasmine.css">
     <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
-    <script src="config.js"></script>
+    <script src="src/config.js"></script>
     <script data-main="tests/main" src="node_modules/requirejs/require.js"></script>
     <style>
         .tests-brand-heading {
