diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index af5f23ff..fcd54805 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -336,7 +336,7 @@ function demo() {
         source: [
             copy.source.commonjs({
                 project: project,
-                require: [ "demo/boot" ]
+                require: [ "demo/demo" ]
             })
         ],
         filter: [ copy.filter.moduleDefines ],
diff --git a/demo/boot.js b/demo/boot.js
deleted file mode 100644
index e6ab437b..00000000
--- a/demo/boot.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-require([ "pilot/fixoldbrowsers", "demo/demo" ], function() {
-    require("demo/demo").launch({});
-});
\ No newline at end of file
diff --git a/demo/demo.js b/demo/demo.js
index 56b6025a..f1e6d3a4 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -40,7 +40,9 @@
 
 define(function(require, exports, module) {
 
-exports.launch = function(env) {
+    require("pilot/fixoldbrowsers");
+
+    var env = {};
     var event = require("pilot/event");
     var Range = require("ace/range").Range;
     var Editor = require("ace/editor").Editor;
diff --git a/kitchen-sink.html b/kitchen-sink.html
index 4428f16b..73b644e9 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -218,14 +218,13 @@
   <script type="text/javascript">
       var require = {
           paths: {
-              demo: "../demo",
               ace: "../lib/ace",
               cockpit: "../support/cockpit/lib/cockpit",
               pilot: "../support/pilot/lib/pilot"
           }
       };
   </script>
-  <script src="demo/require.js" data-main="demo/boot" type="text/javascript" charset="utf-8"></script>
+  <script src="demo/require.js" data-main="demo/demo" type="text/javascript" charset="utf-8"></script>
 <!--DEVEL -->
   
 <!--PACKAGE