diff --git a/demo/boot.js b/demo/boot.js
index 1d89f90d..7862e86d 100644
--- a/demo/boot.js
+++ b/demo/boot.js
@@ -44,10 +44,9 @@ require("pilot/environment");
 require("demo/demo");
 
 require("pilot/index");
-require("cockpit/index");
 require("ace/defaults");
 
-var plugins = [ "pilot/index", "cockpit/index", "ace/defaults" ];
+var plugins = [ "pilot/index", "ace/defaults" ];
 var catalog = require("pilot/plugin_manager").catalog;
 catalog.registerPlugins(plugins).then(function() {
     var env = require("pilot/environment").create();
diff --git a/demo/demo.js b/demo/demo.js
index 280a04a2..9fc08c0c 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -477,8 +477,7 @@ exports.launch = function(env) {
     function onResize() {
         var width = (document.documentElement.clientWidth - 280);
         container.style.width = width + "px";
-        cockpitInput.style.width = width + "px";
-        container.style.height = (document.documentElement.clientHeight - 22) + "px";
+        container.style.height = document.documentElement.clientHeight + "px";
         env.split.resize();
 //        env.editor.resize();
     };
@@ -486,9 +485,6 @@ exports.launch = function(env) {
     window.onresize = onResize;
     onResize();
 
-    // Call resize on the cli explizit. This is necessary for Firefox.
-    env.cli.cliView.resizer()
-
     event.addListener(container, "dragover", function(e) {
         return event.preventDefault(e);
     });
@@ -560,32 +556,6 @@ exports.launch = function(env) {
      * This demonstrates how you can define commands and bind shortcuts to them.
      */
 
-    // Command to focus the command line from the editor.
-    canon.addCommand({
-        name: "focuscli",
-        bindKey: {
-            win: "Ctrl-J",
-            mac: "Command-J",
-            sender: "editor"
-        },
-        exec: function() {
-            env.cli.cliView.element.focus();
-        }
-    });
-
-    // Command to focus the editor line from the command line.
-    canon.addCommand({
-        name: "focuseditor",
-        bindKey: {
-            win: "Ctrl-J",
-            mac: "Command-J",
-            sender: "cli"
-        },
-        exec: function() {
-            env.editor.focus();
-        }
-    });
-
     // Fake-Save, works from the editor and the command line.
     canon.addCommand({
         name: "save",
diff --git a/demo/styles.css b/demo/styles.css
index a4735753..884807d7 100644
--- a/demo/styles.css
+++ b/demo/styles.css
@@ -40,25 +40,4 @@ body {
 
 #controls td + td {
     text-align: left;
-}
-
-#cockpitInput {
-    position: absolute;
-    left: 280px;
-    right: 0px;
-    bottom: 0;
-
-    border: none; outline: none;
-    font-family: consolas, courier, monospace;
-    font-size: 120%;
-}
-
-#cockpitOutput {
-    padding: 10px;
-    margin: 0 15px;
-    border: 1px solid #AAA;
-    -moz-border-radius-topleft: 10px;
-    -moz-border-radius-topright: 10px;
-    border-top-left-radius: 4px; border-top-right-radius: 4px;
-    background: #DDD; color: #000;
 }
\ No newline at end of file
diff --git a/kitchen-sink.html b/kitchen-sink.html
index 941cf169..7ce22f2e 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -683,8 +683,6 @@ object implicits extends Application {
   val x = Array(2, 3, 1, 4)
   println("x = "+ x.sort((x: Int, y: Int) => x < y))
 }</script>
-  <input id="cockpitInput" type="text"/>
-
 <!-- DEVEL-->
   <script type="text/javascript">
       var require = {
@@ -700,7 +698,7 @@ object implicits extends Application {
 <!--DEVEL -->
   
 <!--PACKAGE
-  <script src="demo/kitchen-sink.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
+  <script src="demo/kitchen-sink-uncompressed.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     require("demo/boot");
   </script>