diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index b1c953d5a..000000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "directory": "notebook/static/components"
-}
\ No newline at end of file
diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
index 14d6186a4..870668b4e 100644
--- a/.github/workflows/check-release.yml
+++ b/.github/workflows/check-release.yml
@@ -61,6 +61,7 @@ jobs:
         uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          version_spec: 100.100.100
       - name: Check Links
         if: ${{ matrix.group == 'link_check' }}
         uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1
diff --git a/.github/workflows/enforce-label.yml b/.github/workflows/enforce-label.yml
index 354a0468d..d09f46897 100644
--- a/.github/workflows/enforce-label.yml
+++ b/.github/workflows/enforce-label.yml
@@ -1,3 +1,6 @@
+# Pull requests to this repo should have a triage label,
+# this workflow ensures that this is the case.
+
 name: Enforce PR label
 
 on:
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
deleted file mode 100644
index 6f1bf4c38..000000000
--- a/.github/workflows/js.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Linux JS Tests
-
-on:
-  push:
-    branches: '*'
-  pull_request:
-    branches: '*'
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu, macos]
-        group: [notebook, base, services]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.8
-      - name: Set up Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12.x'
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Cache pip on Linux
-        uses: actions/cache@v1
-        if: startsWith(runner.os, 'Linux')
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ matrix.python }}-${{ hashFiles('**/requirements.txt', 'setup.py') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-${{ matrix.python }}
-
-      - name: Temporary workaround for sanitizer loading in JS Tests
-        run: |
-          cp tools/security_deprecated.js notebook/static/base/js/security.js
-
-      - name: Install dependencies
-        run: |
-          pip install --upgrade pip
-          pip install --upgrade setuptools wheel
-          npm install
-          npm install -g casperjs@1.1.3 phantomjs-prebuilt@2.1.7
-          pip install .[test]
-
-      - name: Run Tests
-        run: |
-          python -m notebook.jstest ${{ matrix.group }}
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 282ea1fd8..77fc5dfe6 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -22,7 +22,7 @@ jobs:
         architecture: 'x64'
     - name: Upgrade packaging dependencies
       run: |
-        pip install --upgrade pip setuptools wheel --user
+        python -m pip install --upgrade pip setuptools wheel --user
     - name: Get pip cache dir
       id: pip-cache
       run: |
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e69de29bb..0952f479d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,2 @@
+repos: []
+
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 6f947cb58..b2b79e72f 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -71,7 +71,7 @@ If you are working in development mode, you will see that your version of Jupyte
 Troubleshooting the Installation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If you do not see that your Jupyter Notebook is not running on dev mode, it's possible that you are
+If you do not see that your Jupyter Notebook is running on dev mode, it's possible that you are
 running other instances of Jupyter Notebook. You can try the following steps:
 
 1. Uninstall all instances of the notebook package. These include any installations you made using
diff --git a/MANIFEST.in b/MANIFEST.in
index c28b82010..64b17e3a8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,13 +3,10 @@ include CONTRIBUTING.rst
 include README.md
 include CHANGELOG.md
 include package.json
-include bower.json
-include .bowerrc
 include pyproject.toml
 include setup.py
 include setupbase.py
 include Dockerfile
-include *.js
 graft tools
 graft notebook/tests
 
diff --git a/bower.json b/bower.json
deleted file mode 100644
index 5f72f6ff0..000000000
--- a/bower.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "jupyter-notebook-deps",
-  "version": "0.0.1",
-  "dependencies": {
-    "backbone": "components/backbone#~1.2",
-    "bootstrap": "bootstrap#~3.4",
-    "bootstrap-tour": "0.9.0",
-    "codemirror": "components/codemirror#5.56.0+components1",
-    "create-react-class": "https://cdn.jsdelivr.net/npm/create-react-class@15.6.3/create-react-class.min.js",
-    "es6-promise": "~1.0",
-    "font-awesome": "components/font-awesome#~4.7.0",
-    "google-caja": "5669",
-    "jed": "~1.1.1",
-    "jquery": "components/jquery#~3.5.0",
-    "jquery-typeahead": "~2.10.6",
-    "jquery-ui": "components/jqueryui#~1.12",
-    "marked": "~0.7",
-    "MathJax": "^2.7.4",
-    "moment": "~2.19.3",
-    "react": "~16.0.0",
-    "requirejs": "~2.2",
-    "requirejs-text": "~2.0.15",
-    "requirejs-plugins": "~1.0.3",
-    "text-encoding": "~0.1",
-    "underscore": "components/underscore#~1.8.3",
-    "xterm.js": "https://unpkg.com/xterm@~3.1.0/dist/xterm.js",
-    "xterm.js-css": "https://unpkg.com/xterm@~3.1.0/dist/xterm.css",
-    "xterm.js-fit": "https://unpkg.com/xterm@~3.1.0/dist/addons/fit/fit.js"
-  }
-}
diff --git a/docs/environment.yml b/docs/environment.yml
index 55cea9b26..8df81e98a 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -13,6 +13,7 @@ dependencies:
 - sphinx
 - terminado
 - myst-parser
+- nbclassic>=0.4.0
 - pip:
   - nbsphinx
   - Send2Trash
diff --git a/docs/source/examples/Notebook/Distributing Jupyter Extensions as Python Packages.ipynb b/docs/source/examples/Notebook/Distributing Jupyter Extensions as Python Packages.ipynb
index c0dd7daae..13a2e08e6 100644
--- a/docs/source/examples/Notebook/Distributing Jupyter Extensions as Python Packages.ipynb	
+++ b/docs/source/examples/Notebook/Distributing Jupyter Extensions as Python Packages.ipynb	
@@ -134,7 +134,7 @@
     "\n",
     "> Of course, in addition to the files listed, there are number of other files one needs to build a proper package. Here are some good resources:\n",
     "- [The Hitchhiker's Guide to Packaging](https://the-hitchhikers-guide-to-packaging.readthedocs.io/en/latest/quickstart.html)\n",
-    "- [Repository Structure and Python](https://kenreitz.org/essays/2013/01/27/repository-structure-and-python) by Kenneth Reitz\n",
+    "- [Structure of the Repository](https://docs.python-guide.org/writing/structure/) by Kenneth Reitz and Real Python\n",
     "\n",
     "> How you distribute them, too, is important:\n",
     "- [Packaging and Distributing Projects](https://python-packaging-user-guide.readthedocs.io/tutorials/distributing-packages/)\n",
diff --git a/notebook/__init__.py b/notebook/__init__.py
index c72096f26..6c71e6e7b 100644
--- a/notebook/__init__.py
+++ b/notebook/__init__.py
@@ -1,8 +1,6 @@
 """The Jupyter HTML Notebook"""
 
 import os
-# Packagers: modify this line if you store the notebook static files elsewhere
-DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(__file__), "static")
 
 # Packagers: modify the next line if you store the notebook template files
 # elsewhere
diff --git a/notebook/_version.py b/notebook/_version.py
index e1eeaf771..95e5289c0 100644
--- a/notebook/_version.py
+++ b/notebook/_version.py
@@ -14,7 +14,3 @@ parts = [int(match[part]) for part in ['major', 'minor', 'patch']]
 if match['rest']:
     parts.append(match['rest'])
 version_info = tuple(parts)
-
-# Downstream maintainer, when running `python.setup.py jsversion`,
-# the version string is propagated to the JavaScript files,  do not forget to
-# patch the JavaScript files in `.postN` release done by distributions.
diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
index a274f4bb3..bd82f497c 100755
--- a/notebook/notebookapp.py
+++ b/notebook/notebookapp.py
@@ -66,11 +66,12 @@ if not sys.platform.startswith('win'):
 
 from notebook import (
     DEFAULT_NOTEBOOK_PORT,
-    DEFAULT_STATIC_FILES_PATH,
     DEFAULT_TEMPLATE_PATH_LIST,
     __version__,
 )
-
+import nbclassic
+# Packagers: modify this line if you store the notebook static files elsewhere
+DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(nbclassic.__file__), "static")
 
 from .base.handlers import Template404, RedirectWithParams
 from .log import log_request
diff --git a/notebook/static/acc_overwrite.less b/notebook/static/acc_overwrite.less
deleted file mode 100644
index 4209ea633..000000000
--- a/notebook/static/acc_overwrite.less
+++ /dev/null
@@ -1,61 +0,0 @@
-//This is file created for overwriting some of bootstrap element color in order to satisfiy the color contrast greater than 4.5:1.
-
-.btn-danger{
-    color: #ffffff;
-    background-color: #df0404;
-    border-color: #df0404;
-}
-
-.btn-warning{
-    color: #ffffff;
-    background-color:#b46102;
-    border-color: #b46102;
-}
-
-@link-color: #296eaa;
-
-.close {
-    float: right;
-    font-size: (@font-size-base * 1.5);
-    font-weight: @close-font-weight;
-    line-height: 1;
-    color: @close-color;
-    text-shadow: @close-text-shadow;
-    .opacity(.6);
-  
-    &:hover,
-    &:focus {
-      color: @close-color;
-      text-decoration: none;
-      cursor: pointer;
-      .opacity(1.0);
-}  button& {
-    padding: 0;
-    cursor: pointer;
-    background: transparent;
-    border: 0;
-    -webkit-appearance: none;
-    appearance: none;
-  }
-}
-
-.navbar-nav {
-    > li > a {
-      color: @navbar-default-link-color;
-      // To make keyboard focus clearly visible on the Controls(File,Edit,View,Insert,Cell...etc)present on the menubar.
-      //&:hover, //To use browser's hover default value 
-      &:focus {
-      /* -webkit-focus-ring-color = '#5B9DD9' */
-      outline: -webkit-focus-ring-color auto 5px;
-     // color: @navbar-default-link-hover-color;
-     // background-color: @navbar-default-link-hover-bg;
-      }
-    }
-}
-
-.menu_focus_highlight{
-  a:focus {
-    outline: -webkit-focus-ring-color auto 5px;
-}
-}
-
diff --git a/notebook/static/auth/css/override.css b/notebook/static/auth/css/override.css
deleted file mode 100644
index 0cb116ec2..000000000
--- a/notebook/static/auth/css/override.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*This file contains any manual css for this page that needs to override the global styles.
-This is only required when different pages style the same element differently. This is just
-a hack to deal with our current css styles and no new styling should be added in this file.*/
-
-#ipython-main-app {
-    padding-top: 50px;
-    text-align: center;
-}
diff --git a/notebook/static/auth/js/loginmain.js b/notebook/static/auth/js/loginmain.js
deleted file mode 100644
index 0c6b661f7..000000000
--- a/notebook/static/auth/js/loginmain.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define(['jquery', 'base/js/namespace', 'base/js/page'], function($, IPython, page) {
-    function login_main() {
-      var page_instance = new page.Page('div#header', 'div#site');
-      page_instance.show();
-      $('input#password_input').focus();
-      IPython.page = page_instance;
-    }
-    return login_main;
-});
diff --git a/notebook/static/auth/js/loginwidget.js b/notebook/static/auth/js/loginwidget.js
deleted file mode 100644
index 8b68d3e84..000000000
--- a/notebook/static/auth/js/loginwidget.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-], function($, utils){
-    "use strict";
-
-    var LoginWidget = function (selector, options) {
-        options = options || {};
-        this.base_url = options.base_url || utils.get_body_data("baseUrl");
-        this.selector = selector;
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.bind_events();
-        }
-    };
-
-
-    LoginWidget.prototype.bind_events = function () {
-        var that = this;
-        this.element.find("button#logout").click(function () {
-            window.location = utils.url_path_join(
-                that.base_url,
-                "logout"
-            );
-        });
-        this.element.find("button#login").click(function () {
-            window.location = utils.url_path_join(
-                that.base_url,
-                "login"
-            );
-        });
-    };
-
-    return {'LoginWidget': LoginWidget};
-});
diff --git a/notebook/static/auth/js/logoutmain.js b/notebook/static/auth/js/logoutmain.js
deleted file mode 100644
index 41e775053..000000000
--- a/notebook/static/auth/js/logoutmain.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define(['base/js/namespace', 'base/js/page'], function(IPython, page) {
-    function logout_main() {
-        var page_instance = new page.Page('div#header', 'div#site');
-        page_instance.show();
-
-        IPython.page = page_instance;
-    }
-    return logout_main;
-});
diff --git a/notebook/static/auth/js/main.js b/notebook/static/auth/js/main.js
deleted file mode 100644
index 68d7871c5..000000000
--- a/notebook/static/auth/js/main.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define(['./loginmain', './logoutmain', 'bidi/bidi'], function (login_main, logout_main, bidi) {
-	if(bidi.isMirroringEnabled()){
-		$("body").attr("dir","rtl");
-	}
-    return {
-        login_main: login_main,
-        logout_main: logout_main
-    };
-});
diff --git a/notebook/static/auth/less/login.less b/notebook/static/auth/less/login.less
deleted file mode 100644
index 8a4ce3ffc..000000000
--- a/notebook/static/auth/less/login.less
+++ /dev/null
@@ -1,23 +0,0 @@
-// Custom styles for login.html
-.center-nav {
-  display: inline-block;
-  // pull the lower margin back
-  margin-bottom: -4px;
-}
-
-[dir="rtl"] .center-nav {
-    form.pull-left {
-        .pull-right();
-    }
-    .navbar-text {
-        float: right;
-    }
-}
-
-[dir="rtl"] .navbar-inner {
-    text-align: right;
-}
-
-[dir="rtl"] div.text-left {
-    .text-right();
-}
diff --git a/notebook/static/auth/less/logout.less b/notebook/static/auth/less/logout.less
deleted file mode 100644
index 63cd701c9..000000000
--- a/notebook/static/auth/less/logout.less
+++ /dev/null
@@ -1,2 +0,0 @@
-// Custom styles for logout.html
-
diff --git a/notebook/static/auth/less/style.less b/notebook/static/auth/less/style.less
deleted file mode 100644
index 4d1919cc0..000000000
--- a/notebook/static/auth/less/style.less
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
-*
-* IPython auth
-*
-*/
-@import "login.less";
-@import "logout.less";
\ No newline at end of file
diff --git a/notebook/static/base/images/favicon-busy-1.ico b/notebook/static/base/images/favicon-busy-1.ico
deleted file mode 100644
index 5b46a8226..000000000
Binary files a/notebook/static/base/images/favicon-busy-1.ico and /dev/null differ
diff --git a/notebook/static/base/images/favicon-busy-2.ico b/notebook/static/base/images/favicon-busy-2.ico
deleted file mode 100644
index 4a8b841c2..000000000
Binary files a/notebook/static/base/images/favicon-busy-2.ico and /dev/null differ
diff --git a/notebook/static/base/images/favicon-busy-3.ico b/notebook/static/base/images/favicon-busy-3.ico
deleted file mode 100644
index b5edce573..000000000
Binary files a/notebook/static/base/images/favicon-busy-3.ico and /dev/null differ
diff --git a/notebook/static/base/images/favicon-file.ico b/notebook/static/base/images/favicon-file.ico
deleted file mode 100644
index 8167018cd..000000000
Binary files a/notebook/static/base/images/favicon-file.ico and /dev/null differ
diff --git a/notebook/static/base/images/favicon-notebook.ico b/notebook/static/base/images/favicon-notebook.ico
deleted file mode 100644
index 4537e2d98..000000000
Binary files a/notebook/static/base/images/favicon-notebook.ico and /dev/null differ
diff --git a/notebook/static/base/images/favicon-terminal.ico b/notebook/static/base/images/favicon-terminal.ico
deleted file mode 100644
index ace499a33..000000000
Binary files a/notebook/static/base/images/favicon-terminal.ico and /dev/null differ
diff --git a/notebook/static/base/images/favicon.ico b/notebook/static/base/images/favicon.ico
deleted file mode 100644
index 2d1bcff7c..000000000
Binary files a/notebook/static/base/images/favicon.ico and /dev/null differ
diff --git a/notebook/static/base/images/logo.png b/notebook/static/base/images/logo.png
deleted file mode 100644
index 3f3f57ff3..000000000
Binary files a/notebook/static/base/images/logo.png and /dev/null differ
diff --git a/notebook/static/base/js/dialog.js b/notebook/static/base/js/dialog.js
deleted file mode 100644
index 77d81185f..000000000
--- a/notebook/static/base/js/dialog.js
+++ /dev/null
@@ -1,433 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define(['jquery',
-    'codemirror/lib/codemirror',
-    'bootstrap',
-	'base/js/i18n'],
-	function($, CodeMirror, bs, i18n) {
-    "use strict";
-
-    /**
-     * A wrapper around bootstrap modal for easier use
-     * Pass it an option dictionary with the following properties:
-     *
-     *    - body : <string> or <DOM node>, main content of the dialog
-     *            if pass a <string> it will be wrapped in a p tag and
-     *            html element escaped, unless you specify sanitize=false
-     *            option.
-     *    - title : Dialog title, default to empty string.
-     *    - buttons : dict of btn_options who keys are button label.
-     *            see btn_options below for description
-     *    - open : callback to trigger on dialog open.
-     *    - destroy:
-     *    - notebook : notebook instance
-     *    - keyboard_manager: keyboard manager instance.
-     *
-     *  Unlike bootstrap modals, the backdrop options is set by default 
-     *  to 'static'.
-     *
-     *  The rest of the options are passed as is to bootstrap modals. 
-     *
-     *  btn_options: dict with the following property:
-     *  
-     *    - click : callback to trigger on click
-     *    - class : css classes to add to button.
-     *
-     *
-     *
-     **/
-    var modal = function (options) {
-
-        var modal = $("<div/>")
-            .addClass("modal")
-            .addClass("fade")
-            .attr("role", "dialog");
-        var dialog = $("<div/>")
-            .addClass("modal-dialog")
-            .appendTo(modal);
-        var dialog_content = $("<div/>")
-            .addClass("modal-content")
-            .appendTo(dialog);
-        if(typeof(options.body) === 'string' && options.sanitize !== false){
-            options.body = $("<p/>").text(options.body);
-        }
-        dialog_content.append(
-            $("<div/>")
-                .addClass("modal-header")
-                .mousedown(function() {
-                  $(".modal").draggable({handle: '.modal-header'});
-                })
-                .append($("<button>")
-                    .attr("type", "button")
-                    .attr("aria-label", i18n.msg._("close"))
-                    .addClass("close")
-                    .attr("data-dismiss", "modal")
-                    .attr("aria-hidden", "true")
-                    .html("&times;")
-                ).append(
-                    $("<h4/>")
-                        .addClass('modal-title')
-                        .text(options.title || "")
-                )
-        ).append(
-            $("<div/>")
-                .addClass("modal-body")
-                .append(
-                    options.body || $("<p/>")
-                )
-        );
-        
-        var footer = $("<div/>").addClass("modal-footer");
-        
-        var default_button;
-        
-        for (var label in options.buttons) {
-            var btn_opts = options.buttons[label];
-            var button = $("<button/>")
-                .addClass("btn btn-default btn-sm")
-                .attr("data-dismiss", "modal")
-                .text(i18n.msg.translate(label).fetch());
-            if (btn_opts.id) {
-                button.attr('id', btn_opts.id);
-            }
-            if (btn_opts.click) {
-                button.click($.proxy(btn_opts.click, dialog_content));
-            }
-            if (btn_opts.class) {
-                button.addClass(btn_opts.class);
-            }
-            footer.append(button);
-            if (options.default_button && label === options.default_button) {
-                default_button = button;
-            }
-        }
-        if (!options.default_button) {
-            default_button = footer.find("button").last();
-        }
-        dialog_content.append(footer);
-        // hook up on-open event
-        modal.on("shown.bs.modal", function () {
-            setTimeout(function () {
-                default_button.focus();
-                if (options.open) {
-                    $.proxy(options.open, modal)();
-                }
-            }, 0);
-        });
-        
-        // destroy modal on hide, unless explicitly asked not to
-        if (options.destroy === undefined || options.destroy) {
-            modal.on("hidden.bs.modal", function () {
-                modal.remove();
-            });
-        }
-        modal.on("hidden.bs.modal", function () {
-            if (options.notebook) {
-                var cell = options.notebook.get_selected_cell();
-                if (cell) cell.select();
-            }
-            if (options.keyboard_manager) {
-                options.keyboard_manager.enable();
-                options.keyboard_manager.command_mode();
-            }
-	    if (options.focus_button) {
-            	$(options.focus_button).focus();
-	    }
-        });
-        
-        if (options.keyboard_manager) {
-            options.keyboard_manager.disable();
-        }
-        
-        if(options.backdrop === undefined){
-          options.backdrop = 'static';
-        }
-        
-        return modal.modal(options);
-    };
-
-    var kernel_modal = function (options) {
-        /**
-         * only one kernel dialog should be open at a time -- but
-         * other modal dialogs can still be open
-         */
-        $('.kernel-modal').modal('hide');
-        var dialog = modal(options);
-        dialog.addClass('kernel-modal');
-        return dialog;
-    };
-
-    var edit_metadata = function (options) {
-        options.name = options.name || "Cell";
-        var error_div = $('<div/>').css('color', 'red');
-        var message_cell = 
-            i18n.msg._("Manually edit the JSON below to manipulate the metadata for this cell.");
-        var message_notebook = 
-            i18n.msg._("Manually edit the JSON below to manipulate the metadata for this notebook.");
-        var message_end = 
-            i18n.msg._(" We recommend putting custom metadata attributes in an appropriately named substructure," +
-            " so they don't conflict with those of others.");
-
-        var message;
-        if (options.name === 'Notebook') {
-        	message = message_notebook + message_end;
-        } else {
-        	message = message_cell + message_end;
-        }
-        var textarea = $('<textarea/>')
-            .attr('rows', '13')
-            .attr('cols', '80')
-            .attr('name', 'metadata')
-            .text(JSON.stringify(options.md || {}, null, 2));
-        
-        var dialogform = $('<div/>').attr('title', i18n.msg._('Edit the metadata'))
-            .append(
-                $('<form/>').append(
-                    $('<fieldset/>').append(
-                        $('<label/>')
-                        .attr('for','metadata')
-                        .text(message)
-                        )
-                        .append(error_div)
-                        .append($('<br/>'))
-                        .append(textarea)
-                    )
-            );
-        var editor = CodeMirror.fromTextArea(textarea[0], {
-            lineNumbers: true,
-            matchBrackets: true,
-            indentUnit: 2,
-            autoIndent: true,
-            mode: 'application/json',
-        });
-        var title_msg;
-        if (options.name === "Notebook") {
-        	title_msg = i18n.msg._("Edit Notebook Metadata");
-        } else {
-        	title_msg = i18n.msg._("Edit Cell Metadata");
-        }
-        // This statement is used simply so that message extraction
-        // will pick up the strings.
-        var button_labels = [ i18n.msg._("Cancel"), i18n.msg._("Edit"), i18n.msg._("OK"), i18n.msg._("Apply")];
-        var modal_obj = modal({
-            title: title_msg,
-            body: dialogform,
-            default_button: "Cancel",
-            buttons: {
-                Cancel: {},
-                Edit: { class : "btn-primary",
-                    click: function() {
-                        /**
-                         * validate json and set it
-                         */
-                        var new_md;
-                        try {
-                            new_md = JSON.parse(editor.getValue());
-                        } catch(e) {
-                            console.log(e);
-                            error_div.text(i18n.msg._('WARNING: Could not save invalid JSON.'));
-                            return false;
-                        }
-                        options.callback(new_md);
-                        options.notebook.apply_directionality();
-                    }
-                }
-            },
-            notebook: options.notebook,
-            keyboard_manager: options.keyboard_manager,
-        });
-
-        modal_obj.on('shown.bs.modal', function(){ editor.refresh(); });
-        modal_obj.on('hide.bs.modal', function(){
-            options.edit_metadata_button ? options.edit_metadata_button.focus() : "";});
-    };
-
-    var edit_attachments = function (options) {
-        // This shows the Edit Attachments dialog. This dialog allows the
-        // user to delete attachments. We show a list of attachments to
-        // the user and he can mark some of them for deletion. The deletion
-        // is applied when the 'Apply' button of this dialog is pressed.
-        var message;
-        var attachments_list;
-        if (Object.keys(options.attachments).length == 0) {
-            message = i18n.msg._("There are no attachments for this cell.");
-            attachments_list = $('<div>');
-        } else {
-            message = i18n.msg._("Current cell attachments");
-
-            attachments_list = $('<div>')
-                .addClass('list_container')
-                .append(
-                    $('<div>')
-                    .addClass('row list_header')
-                    .append(
-                        $('<div>')
-                        .text(i18n.msg._('Attachments'))
-                    )
-                );
-
-            // This is a set containing keys of attachments to be deleted when
-            // the Apply button is clicked
-            var to_delete = {};
-
-            var refresh_attachments_list = function() {
-                $(attachments_list).find('.row').remove();
-                for (var key in options.attachments) {
-                    var mime = Object.keys(options.attachments[key])[0];
-                    var deleted = key in to_delete;
-
-                    // This ensures the current value of key is captured since
-                    // javascript only has function scope
-                    var btn;
-                    // Trash/restore button
-                    (function(){
-                        var _key = key;
-                        btn = $('<button>')
-                            .addClass('btn btn-default btn-xs')
-                            .css('display', 'inline-block');
-                        if (deleted) {
-                            btn.attr('title', i18n.msg._('Restore'))
-                               .append(
-                                   $('<i>')
-                                   .addClass('fa fa-plus')
-                               );
-                            btn.click(function() {
-                                delete to_delete[_key];
-                                refresh_attachments_list();
-                            });
-                        } else {
-                            btn.attr('title', i18n.msg._('Delete'))
-                               .addClass('btn-danger')
-                               .append(
-                                   $('<i>')
-                                   .addClass('fa fa-trash')
-                               );
-                            btn.click(function() {
-                                to_delete[_key] = true;
-                                refresh_attachments_list();
-                            });
-                        }
-                        return btn;
-                    })();
-                    var row = $('<div>')
-                        .addClass('col-md-12 att_row')
-                        .append(
-                            $('<div>')
-                            .addClass('row')
-                            .append(
-                                $('<div>')
-                                .addClass('att-name col-xs-4')
-                                .text(key)
-                            )
-                            .append(
-                                $('<div>')
-                                .addClass('col-xs-4 text-muted')
-                                .text(mime)
-                            )
-                            .append(
-                                $('<div>')
-                                .addClass('item-buttons pull-right')
-                                .append(btn)
-                            )
-                        );
-                    if (deleted) {
-                        row.find('.att-name')
-                           .css('text-decoration', 'line-through');
-                    }
-
-                    attachments_list.append($('<div>')
-                        .addClass('list_item row')
-                        .append(row)
-                    );
-                }
-            };
-            refresh_attachments_list();
-        }
-
-        var dialogform = $('<div/>')
-            .attr('title', i18n.msg._('Edit attachments'))
-            .append(message)
-            .append('<br />')
-            .append(attachments_list);
-        var title_msg;
-        if ( options.name === "Notebook" ) {
-        	title_msg = i18n.msg._("Edit Notebook Attachments");
-        } else {
-        	title_msg = i18n.msg._("Edit Cell Attachments");
-        }
-        var modal_obj = modal({
-            title: title_msg,
-            body: dialogform,
-            buttons: {
-                Apply: { class : "btn-primary",
-                    click: function() {
-                        for (var key in to_delete) {
-                            delete options.attachments[key];
-                        }
-                        options.callback(options.attachments);
-                    }
-                },
-                Cancel: {}
-            },
-            notebook: options.notebook,
-            keyboard_manager: options.keyboard_manager,
-        });
-    };
-
-    var insert_image = function (options) {
-        var message =
-            i18n.msg._("Select a file to insert.");
-        var file_input = $('<input/>')
-            .attr('type', 'file')
-            .attr('accept', 'image/*')
-            .attr('name', 'file')
-            .on('change', function(file) {
-                var $btn = $(modal_obj).find('#btn_ok');
-                if (this.files.length > 0) {
-                    $btn.removeClass('disabled');
-                } else {
-                    $btn.addClass('disabled');
-                }
-            });
-        var dialogform = $('<div/>').attr('title', i18n.msg._('Edit attachments'))
-            .append(
-                $('<form id="insert-image-form" />').append(
-                    $('<fieldset/>').append(
-                        $('<label/>')
-                        .attr('for','file')
-                        .text(message)
-                        )
-                        .append($('<br/>'))
-                        .append(file_input)
-                    )
-            );
-        var modal_obj = modal({
-            title: i18n.msg._("Select a file"),
-            body: dialogform,
-            buttons: {
-                OK: {
-                    id : 'btn_ok',
-                    class : "btn-primary disabled",
-                    click: function() {
-                        options.callback(file_input[0].files[0]);
-                    }
-                },
-                Cancel: {}
-            },
-            notebook: options.notebook,
-            keyboard_manager: options.keyboard_manager,
-        });
-    };
-
-    
-    var dialog = {
-        modal : modal,
-        kernel_modal : kernel_modal,
-        edit_metadata : edit_metadata,
-        edit_attachments : edit_attachments,
-        insert_image : insert_image
-    };
-
-    return dialog;
-});
diff --git a/notebook/static/base/js/events.js b/notebook/static/base/js/events.js
deleted file mode 100644
index 36b6b3363..000000000
--- a/notebook/static/base/js/events.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-// Give us an object to bind all events to. This object should be created
-// before all other objects so it exists when others register event handlers.
-// To register an event handler:
-//
-// requirejs(['base/js/events'], function (events) {
-//     events.on("event.Namespace", function () { do_stuff(); });
-// });
-
-define(['jquery', 'base/js/namespace'], function($, Jupyter) {
-    "use strict";
-    
-    // Events singleton
-    if (!window._Events) {
-        window._Events = function () {};
-        window._events = new window._Events();
-    }
-    
-    // Backwards compatibility.
-    Jupyter.Events = window._Events;
-    Jupyter.events = window._events;
-    
-    var events = $([window._events]);
-
-    // catch and log errors in triggered events
-    events._original_trigger = events.trigger;
-    events.trigger = function (name, data) {
-        try {
-            this._original_trigger.apply(this, arguments);
-        } catch (e) {
-            console.error("Exception in event handler for " + name, e, arguments);
-        }
-    }
-    return events;
-});
diff --git a/notebook/static/base/js/i18n.js b/notebook/static/base/js/i18n.js
deleted file mode 100644
index 464d5f236..000000000
--- a/notebook/static/base/js/i18n.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-// Module to handle i18n ( Internationalization ) and translated UI
-
-define([
-    'jed'
-	], function(Jed) {
-    "use strict";
-
-    var i18n = new Jed(document.nbjs_translations);
-    i18n._ = i18n.gettext;
-    i18n.msg = i18n; // Just a place holder until the init promise resolves.
-
-    return i18n;
-});
diff --git a/notebook/static/base/js/keyboard.js b/notebook/static/base/js/keyboard.js
deleted file mode 100644
index 41446c618..000000000
--- a/notebook/static/base/js/keyboard.js
+++ /dev/null
@@ -1,576 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-/**
- *
- *
- * @module keyboard
- * @namespace keyboard
- * @class ShortcutManager
- */
-
-define([
-    'jquery',
-    'base/js/utils',
-    'underscore',
-], function($, utils, _) {
-    "use strict";
-
-
-    /**
-     * Setup global keycodes and inverse keycodes.
-     *
-     * See http://unixpapa.com/js/key.html for a complete description. The short of
-     * it is that there are different keycode sets. Firefox uses the "Mozilla keycodes"
-     * and Webkit/IE use the "IE keycodes". These keycode sets are mostly the same
-     * but have minor differences.
-     **/
-
-     // These apply to Firefox, (Webkit and IE)
-     // This does work **only** on US keyboard.
-    var _keycodes = {
-        'a': 65, 'b': 66, 'c': 67, 'd': 68, 'e': 69, 'f': 70, 'g': 71, 'h': 72, 'i': 73,
-        'j': 74, 'k': 75, 'l': 76, 'm': 77, 'n': 78, 'o': 79, 'p': 80, 'q': 81, 'r': 82,
-        's': 83, 't': 84, 'u': 85, 'v': 86, 'w': 87, 'x': 88, 'y': 89, 'z': 90,
-        '1 !': 49, '2 @': 50, '3 #': 51, '4 $': 52, '5 %': 53, '6 ^': 54,
-        '7 &': 55, '8 *': 56, '9 (': 57, '0 )': 48, 
-        '[ {': 219, '] }': 221, '` ~': 192,  ', <': 188, '. >': 190, '/ ?': 191,
-        '\\ |': 220, '\' "': 222,
-        'numpad0': 96, 'numpad1': 97, 'numpad2': 98, 'numpad3': 99, 'numpad4': 100,
-        'numpad5': 101, 'numpad6': 102, 'numpad7': 103, 'numpad8': 104, 'numpad9': 105,
-        'multiply': 106, 'add': 107, 'subtract': 109, 'decimal': 110, 'divide': 111,
-        'f1': 112, 'f2': 113, 'f3': 114, 'f4': 115, 'f5': 116, 'f6': 117, 'f7': 118,
-        'f8': 119, 'f9': 120, 'f10': 121, 'f11': 122, 'f12': 123, 'f13': 124, 'f14': 125, 'f15': 126,
-        'backspace': 8, 'tab': 9, 'enter': 13, 'shift': 16, 'ctrl': 17, 'alt': 18,
-        'meta': 91, 'capslock': 20, 'esc': 27, 'space': 32, 'pageup': 33, 'pagedown': 34,
-        'end': 35, 'home': 36, 'left': 37, 'up': 38, 'right': 39, 'down': 40,
-        'insert': 45, 'delete': 46, 'numlock': 144,
-    };
-    
-    // These apply to Firefox and Opera
-    var _mozilla_keycodes = {
-        '; :': 59, '= +': 61, '- _': 173, 'meta': 224, 'minus':173
-    };
-    
-    // This apply to Webkit and IE
-    var _ie_keycodes = {
-        '; :': 186, '= +': 187, '- _': 189, 'minus':189
-    };
-    
-    var browser = utils.browser[0];
-    var platform = utils.platform;
-    
-    if (browser === 'Firefox' || browser === 'Opera' || browser === 'Netscape') {
-        $.extend(_keycodes, _mozilla_keycodes);
-    } else if (browser === 'Safari' || browser === 'Chrome' || browser === 'MSIE') {
-        $.extend(_keycodes, _ie_keycodes);
-    }
-
-    var keycodes = {};
-    var inv_keycodes = {};
-    for (var name in _keycodes) {
-        var names = name.split(' ');
-        if (names.length === 1) {
-            var n = names[0];
-            keycodes[n] = _keycodes[n];
-            inv_keycodes[_keycodes[n]] = n;
-        } else {
-            var primary = names[0];
-            var secondary = names[1];
-            keycodes[primary] = _keycodes[name];
-            keycodes[secondary] = _keycodes[name];
-            inv_keycodes[_keycodes[name]] = primary;
-        }
-    }
-
-    var normalize_key = function (key) {
-        return inv_keycodes[keycodes[key]];
-    };
-
-    var normalize_shortcut = function (shortcut) {
-        /**
-         * @function _normalize_shortcut
-         * @private
-         * return a dict containing the normalized shortcut and the number of time it should be pressed:
-         *
-         * Put a shortcut into normalized form:
-         * 1. Make lowercase
-         * 2. Replace cmd by meta
-         * 3. Sort '-' separated modifiers into the order alt-ctrl-meta-shift
-         * 4. Normalize keys
-         **/
-        if (platform === 'MacOS') {
-            shortcut = shortcut.toLowerCase().replace('cmdtrl-', 'cmd-');
-        } else {
-            shortcut = shortcut.toLowerCase().replace('cmdtrl-', 'ctrl-');
-        }
-
-        shortcut = shortcut.toLowerCase().replace('cmd', 'meta');
-        shortcut = shortcut.replace(/-$/, 'minus');  // catch shortcuts using '-' key
-        shortcut = shortcut.replace(/,$/, 'comma');  // catch shortcuts using '-' key
-        if(shortcut.indexOf(',') !== -1){
-            var sht = shortcut.split(',');
-            sht = _.map(sht, normalize_shortcut);
-            return shortcut;
-        }
-        shortcut = shortcut.replace(/comma/g, ',');  // catch shortcuts using '-' key
-        var values = shortcut.split("-");
-        if (values.length === 1) {
-            return normalize_key(values[0]);
-        } else {
-            var modifiers = values.slice(0,-1);
-            var key = normalize_key(values[values.length-1]);
-            modifiers.sort();
-            return modifiers.join('-') + '-' + key;
-        }
-    };
-
-    var shortcut_to_event = function (shortcut, type) {
-        /**
-         * Convert a shortcut (shift-r) to a jQuery Event object
-         **/
-        type = type || 'keydown';
-        shortcut = normalize_shortcut(shortcut);
-        shortcut = shortcut.replace(/-$/, 'minus');  // catch shortcuts using '-' key
-        var values = shortcut.split("-");
-        var modifiers = values.slice(0,-1);
-        var key = values[values.length-1];
-        var opts = {which: keycodes[key]};
-        if (modifiers.indexOf('alt') !== -1) {opts.altKey = true;}
-        if (modifiers.indexOf('ctrl') !== -1) {opts.ctrlKey = true;}
-        if (modifiers.indexOf('meta') !== -1) {opts.metaKey = true;}
-        if (modifiers.indexOf('shift') !== -1) {opts.shiftKey = true;}
-        return $.Event(type, opts);
-    };
-
-    var only_modifier_event = function(event){
-        /**
-         * Return `true` if the event only contains modifiers keys.
-         * false otherwise
-         **/
-        var key = inv_keycodes[event.which];
-        return ((event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) &&
-         (key === 'alt'|| key === 'ctrl'|| key === 'meta'|| key === 'shift'));
-
-    };
-
-    var event_to_shortcut = function (event) {
-        /**
-         * Convert a jQuery Event object to a normalized shortcut string (shift-r)
-         **/
-        var shortcut = '';
-        var key = inv_keycodes[event.which];
-        if (event.altKey && key !== 'alt') {shortcut += 'alt-';}
-        if (event.ctrlKey && key !== 'ctrl') {shortcut += 'ctrl-';}
-        if (event.metaKey && key !== 'meta') {shortcut += 'meta-';}
-        if (event.shiftKey && key !== 'shift') {shortcut += 'shift-';}
-        shortcut += key;
-        return shortcut;
-    };
-
-    // Shortcut manager class
-
-    var ShortcutManager = function (delay, events, actions, env, config, mode) {
-        /**
-         * A class to deal with keyboard event and shortcut
-         *
-         * @class ShortcutManager
-         * @constructor
-         *
-         * :config: configobjet on which to call `update(....)` to persist the config.
-         * :mode: mode of this shortcut manager where to persist config.
-         */
-        mode = mode || 'command';
-        this._shortcuts = {};
-        this._defaults_bindings = [];
-        this.delay = delay || 800; // delay in milliseconds
-        this.events = events;
-        this.actions = actions;
-        this.actions.extend_env(env);
-        this._queue = [];
-        this._cleartimeout = null;
-        this._config = config;
-        this._mode = mode;
-        Object.seal(this);
-    };
-
-    ShortcutManager.prototype.clearsoon = function(){
-        /**
-         * Clear the pending shortcut soon, and cancel previous clearing
-         * that might be registered.
-         **/
-         var that = this;
-         clearTimeout(this._cleartimeout);
-         this._cleartimeout = setTimeout(function(){that.clearqueue();}, this.delay);
-    };
-
-
-    ShortcutManager.prototype.clearqueue = function(){
-        /**
-         * clear the pending shortcut sequence now. 
-         **/
-        this._queue = [];
-        clearTimeout(this._cleartimeout);
-    };
-
-
-    var flatten_shorttree = function(tree){
-        /**
-         * Flatten a tree of shortcut sequences. 
-         * use full to iterate over all the key/values of available shortcuts.
-         **/
-        var dct = {};
-        _.forEach(tree, function(value, key) {
-            if(typeof(value) === 'string'){
-                dct[key] = value;
-            } else {
-                var ftree=flatten_shorttree(value);
-                _.forEach(ftree, function(v2, subkey) {
-                    dct[key+','+subkey] = ftree[subkey];
-                });
-            } 
-        });
-        return dct;
-    };
-
-
-    ShortcutManager.prototype.get_action_shortcuts = function(name){
-      var ftree = flatten_shorttree(this._shortcuts);
-      var res = [];
-      _.forEach(ftree, function(value, key) {
-        if(value === name){
-          res.push(key);
-        }
-      });
-      return res;
-    };
-    
-    ShortcutManager.prototype.get_action_shortcut = function(name){
-      var matches = this.get_action_shortcuts(name);
-      if (matches.length > 0) {
-          return matches[0];
-      }
-      return undefined;
-    };
-
-    ShortcutManager.prototype.help = function () {
-        var that = this;
-        var help = [];
-        var ftree = flatten_shorttree(this._shortcuts);
-        _.forEach(ftree, function(value, key) {
-            var action = that.actions.get(value);
-            var help_string = action.help||'== no help ==';
-            var help_index = action.help_index;
-            if (help_string) {
-                var shortstring = (action.shortstring||key);
-                help.push({
-                    shortcut: shortstring,
-                    help: help_string,
-                    help_index: help_index}
-                );
-            }
-        });
-        help.sort(function (a, b) {
-            if (a.help_index === b.help_index) {
-                if (a.shortcut === b.shortcut) {
-                    return 0;
-                }
-                if (a.shortcut > b.shortcut) {
-                    return 1;
-                }
-                return -1;
-            }
-            if (a.help_index === undefined || a.help_index > b.help_index){
-                return 1;
-            }
-            return -1;
-        });
-        return help;
-    };
-
-    ShortcutManager.prototype.clear_shortcuts = function () {
-        this._shortcuts = {};
-    };
-
-    ShortcutManager.prototype.get_shortcut = function (shortcut){
-        /**
-         * return a node of the shortcut tree which an action name (string) if leaf,
-         * and an object with `object.subtree===true`
-         **/
-        if(typeof(shortcut) === 'string'){
-            shortcut = shortcut.split(',');
-        }
-        
-        return this._get_leaf(shortcut, this._shortcuts);
-    };
-
-
-    ShortcutManager.prototype._get_leaf = function(shortcut_array, tree){
-        /**
-         * @private
-         * find a leaf/node in a subtree of the keyboard shortcut
-         *
-         **/
-        if(shortcut_array.length === 1){
-            return tree[shortcut_array[0]];
-        } else if(  typeof(tree[shortcut_array[0]]) !== 'string'){
-            return this._get_leaf(shortcut_array.slice(1), tree[shortcut_array[0]]);
-        }
-        return null;
-    };
-
-    ShortcutManager.prototype.set_shortcut = function( shortcut, action_name){
-        if( typeof(action_name) !== 'string'){throw new Error('action is not a string', action_name);}
-        if( typeof(shortcut) === 'string'){
-            shortcut = shortcut.split(',');
-        }
-        return this._set_leaf(shortcut, action_name, this._shortcuts);
-    };
-
-    ShortcutManager.prototype._is_leaf = function(shortcut_array, tree){
-        if(shortcut_array.length === 1){
-           return(typeof(tree[shortcut_array[0]]) === 'string');
-        } else {
-            var subtree = tree[shortcut_array[0]];
-            return this._is_leaf(shortcut_array.slice(1), subtree );
-        }
-    };
-
-    ShortcutManager.prototype._remove_leaf = function(shortcut_array, tree, allow_node){
-        if(shortcut_array.length === 1){
-            var current_node = tree[shortcut_array[0]];
-            if(typeof(current_node) === 'string'){
-                delete tree[shortcut_array[0]];
-            } else {
-                throw new Error('try to delete non-leaf');
-            }
-        } else {
-            this._remove_leaf(shortcut_array.slice(1),  tree[shortcut_array[0]], allow_node);
-            if(_.keys(tree[shortcut_array[0]]).length === 0){
-                delete tree[shortcut_array[0]];
-            }
-        }
-    };
-
-    ShortcutManager.prototype.is_available_shortcut = function(shortcut){
-        var shortcut_array = shortcut.split(',');
-        return this._is_available_shortcut(shortcut_array, this._shortcuts);
-    };
-
-    ShortcutManager.prototype._is_available_shortcut = function(shortcut_array, tree){
-        var current_node = tree[shortcut_array[0]];
-        if(!shortcut_array[0]){
-            return false;
-        }
-        if(current_node === undefined){
-            return true;
-        } else {
-            if (typeof(current_node) === 'string'){
-                return false;
-            } else { // assume is a sub-shortcut tree
-                return this._is_available_shortcut(shortcut_array.slice(1), current_node);
-            }
-        }
-    };
-
-    ShortcutManager.prototype._set_leaf = function(shortcut_array, action_name, tree){
-        var current_node = tree[shortcut_array[0]];
-
-        if(shortcut_array.length === 1){
-            if(current_node !== undefined && typeof(current_node) !== 'string'){
-                console.warn('[warning], you are overriting a long shortcut with a shorter one');
-            }
-            tree[shortcut_array[0]] = action_name;
-            return true;
-        } else {
-            if(typeof(current_node) === 'string'){
-                console.warn('you are trying to set a shortcut that will be shadowed'+
-                             'by a more specific one. Aborting for :', action_name, 'the following '+
-                             'will take precedence', current_node);
-                return false;
-            } else {
-                tree[shortcut_array[0]] = tree[shortcut_array[0]]||{};
-            }
-            this._set_leaf(shortcut_array.slice(1), action_name, tree[shortcut_array[0]]);
-            return true;
-        }
-    };
-
-    ShortcutManager.prototype._persist_shortcut = function(shortcut, data) {
-        /**
-         * add a shortcut to this manager and persist it to the config file. 
-         **/ 
-        shortcut = shortcut.toLowerCase();
-        this.add_shortcut(shortcut, data);
-        var patch = {keys:{}};
-        patch.keys[this._mode] = {bind:{}};
-        patch.keys[this._mode].bind[shortcut] = data;
-        this._config.update(patch);
-    };
-
-    ShortcutManager.prototype._persist_remove_shortcut = function(shortcut){
-        /**
-         * Remove a shortcut from this manager and persist its removal.
-         */
-
-        shortcut = shortcut.toLowerCase();
-        this.remove_shortcut(shortcut);
-        var patch = {keys: {}};
-        patch.keys[this._mode] = {bind:{}};
-        patch.keys[this._mode].bind[shortcut] = null;
-        this._config.update(patch);
-
-        // if the shortcut we unbind is a default one, we add it to the list of
-        // things to unbind at startup
-        if( this._defaults_bindings.indexOf(shortcut) !== -1 ){
-            var cnf = (this._config.data.keys || {})[this._mode];
-            var unbind_array = cnf.unbind || [];
-
-
-            // unless it's already there (like if we have remapped a default
-            // shortcut to another command): unbind it)
-            if(unbind_array.indexOf(shortcut) === -1){
-                var _parray = unbind_array.concat(shortcut);
-                var unbind_patch = {keys:{}};
-                unbind_patch.keys[this._mode] = {unbind:_parray};
-                console.warn('up:', unbind_patch);
-                this._config.update(unbind_patch);
-            }
-        }
-    };
-
-
-    ShortcutManager.prototype.add_shortcut = function (shortcut, data, suppress_help_update) {
-        /**
-         * Add an action to be handled by shortcut manager. 
-         * 
-         * - `shortcut` should be a `Shortcut Sequence` of the for `Ctrl-Alt-C,Meta-X`...
-         * - `data` could be an `action name`, an `action` or a `function`.
-         *   if a `function` is passed it will be converted to an anonymous `action`. 
-         *
-         **/
-        var action_name = this.actions.get_name(data);
-        if (! action_name){
-          if (typeof data === 'string') {
-            // If we have an action name, allow it to be bound anyway.
-            console.log("Unknown action '" + data + "' for shortcut " + shortcut
-                + "; it may be defined by an extension which is not yet loaded.");
-            action_name = data;
-          } else {
-            throw new Error('does not know how to deal with : ' + data);
-          }
-        }
-        var _shortcut = normalize_shortcut(shortcut);
-        this.set_shortcut(_shortcut, action_name);
-
-        if (!suppress_help_update) {
-            // update the keyboard shortcuts notebook help
-            this.events.trigger('rebuild.QuickHelp');
-        }
-    };
-
-    ShortcutManager.prototype.add_shortcuts = function (data) {
-        /**
-         * Convenient methods to call `add_shortcut(key, value)` on several items
-         * 
-         *  data : Dict of the form {key:value, ...}
-         **/
-        var that = this;
-        _.forEach(data, function(value, key) {
-            that.add_shortcut(key, value, true);
-        });
-        // update the keyboard shortcuts notebook help
-        this.events.trigger('rebuild.QuickHelp');
-    };
-
-    ShortcutManager.prototype._add_default_shortcuts = function (data) {
-        /**
-         * same as add_shortcuts, but register them as "default" that if persistently unbound, with
-         * persist_remove_shortcut, need to be on the "unbind" list. 
-         **/
-        this._defaults_bindings = this._defaults_bindings.concat(Object.keys(data));
-        this.add_shortcuts(data);
-
-    };
-
-    ShortcutManager.prototype.remove_shortcut = function (shortcut, suppress_help_update) {
-        /**
-         * Remove the binding of shortcut `shortcut` with its action.
-         * throw an error if trying to remove a non-exiting shortcut
-         **/
-        if(!shortcut){
-            console.warn('trying to remove empty shortcut');
-            return;
-        }
-        shortcut = normalize_shortcut(shortcut);
-        if( typeof(shortcut) === 'string'){
-            shortcut = shortcut.split(',');
-        }
-        /*
-         *  The shortcut error should be explicit here, because it will be
-         *  seen by users.
-         */
-        try {
-          this._remove_leaf(shortcut, this._shortcuts);
-          if (!suppress_help_update) {
-            // update the keyboard shortcuts notebook help
-            this.events.trigger('rebuild.QuickHelp');
-          }
-        } catch (ex) {
-          throw new Error('trying to remove a non-existent shortcut', shortcut, typeof shortcut);
-        }
-    };
-
-
-
-    ShortcutManager.prototype.call_handler = function (event) {
-        /**
-         * Call the corresponding shortcut handler for a keyboard event
-         * @method call_handler
-         * @return {Boolean} `true|false`, `false` if no handler was found, otherwise the  value return by the handler. 
-         * @param event {event}
-         *
-         * given an event, call the corresponding shortcut. 
-         * return false is event wan handled, true otherwise 
-         * in any case returning false stop event propagation
-         **/
-
-
-        this.clearsoon();
-        if(only_modifier_event(event)){
-            return true;
-        }
-        var shortcut = event_to_shortcut(event);
-        this._queue.push(shortcut);
-        var action_name = this.get_shortcut(this._queue);
-
-        if (typeof(action_name) === 'undefined'|| action_name === null){
-            this.clearqueue();
-            return true;
-        }
-        
-        if (this.actions.exists(action_name)) {
-            event.preventDefault();
-            this.clearqueue();
-            return this.actions.call(action_name, event);
-        }
-
-        return false;
-    };
-
-
-    ShortcutManager.prototype.handles = function (event) {
-        var shortcut = event_to_shortcut(event);
-        var action_name = this.get_shortcut(this._queue.concat(shortcut));
-        return (typeof(action_name) !== 'undefined');
-    };
-
-    return {
-        keycodes : keycodes,
-        inv_keycodes : inv_keycodes,
-        ShortcutManager : ShortcutManager,
-        normalize_key : normalize_key,
-        normalize_shortcut : normalize_shortcut,
-        shortcut_to_event : shortcut_to_event,
-        event_to_shortcut : event_to_shortcut,
-    };
-});
diff --git a/notebook/static/base/js/markdown.js b/notebook/static/base/js/markdown.js
deleted file mode 100644
index 492ac3755..000000000
--- a/notebook/static/base/js/markdown.js
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/mathjaxutils',
-    'base/js/security',
-    'components/marked/lib/marked',
-    'codemirror/lib/codemirror',
-], function($, utils, mathjaxutils, security, marked, CodeMirror){
-    "use strict";
-
-    marked.setOptions({
-        gfm : true,
-        tables: true,
-        langPrefix: "cm-s-ipython language-",
-        highlight: function(code, lang, callback) {
-            if (!lang) {
-                // no language, no highlight
-                if (callback) {
-                    callback(null, code);
-                    return;
-                } else {
-                    return code;
-                }
-            }
-            utils.requireCodeMirrorMode(lang, function (spec) {
-                var el = document.createElement("div");
-                var mode = CodeMirror.getMode({}, spec);
-                if (!mode) {
-                    console.log("No CodeMirror mode: " + lang);
-                    callback(null, code);
-                    return;
-                }
-                try {
-                    CodeMirror.runMode(code, spec, el);
-                    callback(null, el.innerHTML);
-                } catch (err) {
-                    console.log("Failed to highlight " + lang + " code", err);
-                    callback(err, code);
-                }
-            }, function (err) {
-                console.log("No CodeMirror mode: " + lang);
-                console.log("Require CodeMirror mode error: " + err);
-                callback(null, code);
-            });
-        }
-    });
-
-    var mathjax_init_done = false;
-    function ensure_mathjax_init() {
-        if(!mathjax_init_done) {
-            mathjax_init_done = true;
-            mathjaxutils.init();
-        }
-    }
-
-    function render(markdown, options, callback) {
-        /**
-         * Find a readme in the current directory. Look for files with
-         * a name like 'readme.md' (case insensitive) or similar and
-         * mimetype 'text/markdown'.
-         * 
-         * @param markdown: the markdown text to parse
-         * @param options
-         *  Object with parameters:
-         *      with_math: the markdown can contain mathematics
-         *      clean_tables: prevent default inline styles for table cells
-         *      sanitize: remove dangerous html (like <script>)
-         * @param callback
-         *  A function with two arguments (err, html)
-         *      err: null or the error if there was one
-         *      html: the rendered html string, or if {sanitize: true} was used
-        *             a sanitized jQuery object
-         */
-        options = $.extend({
-            // Apply mathjax transformation
-            with_math: false,
-            // Prevent marked from returning inline styles for table cells
-            clean_tables: false,
-            // Apply sanitation, this will return a jQuery object.
-            sanitize: false,
-        }, options);
-        var renderer = new marked.Renderer();
-        if(options.clean_tables) {
-            renderer.tablecell = function (content, flags) {
-            var type = flags.header ? 'th' : 'td';
-            var style = flags.align == null ? '': ' style="text-align: ' + flags.align + '"';
-            var start_tag = '<' + type + style + '>';
-            var end_tag = '</' + type + '>\n';
-            return start_tag + content + end_tag;
-            };
-        }
-        var text = markdown;
-        var math = null;
-        if(options.with_math) {
-            ensure_mathjax_init();
-            var text_and_math = mathjaxutils.remove_math(markdown);
-            text = text_and_math[0];
-            math = text_and_math[1];
-        }
-        marked(text, { renderer: renderer }, function (err, html) {
-            if(!err) {
-                if(options.with_math) {
-                    html = mathjaxutils.replace_math(html, math);
-                }
-                if(options.sanitize) {
-                    html = $(security.sanitize_html_and_parse(html, true));
-                }
-            }
-            callback(err, html);
-        });
-    }
-
-    return {'render': render};
-});
diff --git a/notebook/static/base/js/mathjaxutils.js b/notebook/static/base/js/mathjaxutils.js
deleted file mode 100644
index 296f15e27..000000000
--- a/notebook/static/base/js/mathjaxutils.js
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/dialog',
-], function($, utils, i18n, dialog) {
-    "use strict";
-
-    var init = function () {
-        if (window.MathJax) {
-            // MathJax loaded
-            MathJax.Hub.Config({
-                tex2jax: {
-                    inlineMath: [ ['$','$'], ["\\(","\\)"] ],
-                    displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
-                    processEscapes: true,
-                    processEnvironments: true
-                },
-                TeX: {
-                    extensions: ['newcommand.js', 'begingroup.js']  // For \gdef
-                },
-                MathML: {
-                    extensions: ['content-mathml.js']
-                },
-                // Center justify equations in code and markdown cells. Elsewhere
-                // we use CSS to left justify single line equations in code cells.
-                displayAlign: 'center',
-                "HTML-CSS": {
-                    availableFonts: [],
-                    imageFont: null,
-                    preferredFont: null,
-                    webFont: "STIX-Web",
-                    styles: {'.MathJax_Display': {"margin": 0}},
-                    linebreaks: { automatic: true }
-                },
-            });
-            MathJax.Hub.Configured();
-        } else if (window.mathjax_url !== "") {
-            // This statement is used simply so that message extraction
-            // will pick up the strings.  The actual setting of the text
-            // for the button is in dialog.js.
-            var button_labels = [ i18n.msg._("OK") ];
-            // Don't have MathJax, but should. Show dialog.
-            dialog.modal({
-                title : i18n.msg.sprintf(i18n.msg._("Failed to retrieve MathJax from '%s'",window.mathjax_url)),
-                body : $("<p/>").addClass('dialog').text(
-                        i18n.msg._("Math/LaTeX rendering will be disabled.")
-                    ),
-                buttons : {
-                    OK : {class: "btn-danger"}
-                }
-            });
-        }
-    };
-
-    // Some magic for deferring mathematical expressions to MathJax
-    // by hiding them from the Markdown parser.
-    // Some of the code here is adapted with permission from Davide Cervone
-    // under the terms of the Apache2 license governing the MathJax project.
-    // Other minor modifications are also due to StackExchange and are used with
-    // permission.
-
-    // MATHSPLIT contains the pattern for math delimiters and special symbols
-    // needed for searching for math in the text input.
-    var MATHSPLIT = /(\$\$?|\\(?:begin|end)\{[a-z]*\*?\}|\\[{}$]|[{}]|(?:\n\s*)+|@@\d+@@|\\\\(?:\(|\)|\[|\]))/i;
-
-    //  The math is in blocks i through j, so
-    //    collect it into one block and clear the others.
-    //  Replace &, <, and > by named entities.
-    //  For IE, put <br> at the ends of comments since IE removes \n.
-    //  Clear the current math positions and store the index of the
-    //    math, then push the math string onto the storage array.
-    //  The preProcess function is called on all blocks if it has been passed in
-    var process_math = function (i, j, pre_process, math, blocks) {
-        var block = blocks.slice(i, j + 1).join("").replace(/&/g, "&amp;") // use HTML entity for &
-        .replace(/</g, "&lt;") // use HTML entity for <
-        .replace(/>/g, "&gt;") // use HTML entity for >
-        ;
-        if (utils.browser === 'msie') {
-            block = block.replace(/(%[^\n]*)\n/g, "$1<br/>\n");
-        }
-        while (j > i) {
-            blocks[j] = "";
-            j--;
-        }
-        blocks[i] = "@@" + math.length + "@@"; // replace the current block text with a unique tag to find later
-        if (pre_process){
-            block = pre_process(block);
-        }
-        math.push(block);
-        return blocks;
-    };
-
-    //  Break up the text into its component parts and search
-    //    through them for math delimiters, braces, linebreaks, etc.
-    //  Math delimiters must match and braces must balance.
-    //  Don't allow math to pass through a double linebreak
-    //    (which will be a paragraph).
-    //
-    var remove_math = function (text) {
-        var math = []; // stores math strings for later
-        var start;
-        var end;
-        var last;
-        var braces;
-
-        // Except for extreme edge cases, this should catch precisely those pieces of the markdown
-        // source that will later be turned into code spans. While MathJax will not TeXify code spans,
-        // we still have to consider them at this point; the following issue has happened several times:
-        //
-        //     `$foo` and `$bar` are varibales.  -->  <code>$foo ` and `$bar</code> are variables.
-
-        var hasCodeSpans = /`/.test(text),
-            de_tilde;
-        if (hasCodeSpans) {
-            var tilde = function (wholematch) {
-                return wholematch.replace(/\$/g, "~D");
-            }
-            text = text.replace(/~/g, "~T")
-                       .replace(/(^|[^\\])(`+)([^\n]*?[^`\n])\2(?!`)/gm, tilde)
-                       .replace(/^\s{0,3}(`{3,})(.|\n)*?\1/gm, tilde);
-            de_tilde = function (text) {
-                return text.replace(/~([TD])/g, function (wholematch, character) {
-                                                    return { T: "~", D: "$" }[character];
-                                                });
-            };
-        } else {
-            de_tilde = function (text) { return text; };
-        }
-
-        var blocks = utils.regex_split(text.replace(/\r\n?/g, "\n"),MATHSPLIT);
-
-        for (var i = 1, m = blocks.length; i < m; i += 2) {
-            var block = blocks[i];
-            if (block.charAt(0) === "@") {
-                //
-                //  Things that look like our math markers will get
-                //  stored and then retrieved along with the math.
-                //
-                blocks[i] = "@@" + math.length + "@@";
-                math.push(block);
-            }
-            else if (start) {
-                //
-                //  If we are in math, look for the end delimiter,
-                //    but don't go past double line breaks, and
-                //    and balance braces within the math.
-                //
-                if (block === end) {
-                    if (braces) {
-                        last = i;
-                    }
-                    else {
-                        blocks = process_math(start, i, de_tilde, math, blocks);
-                        start  = null;
-                        end    = null;
-                        last   = null;
-                    }
-                }
-                else if (block.match(/\n.*\n/)) {
-                    if (last) {
-                        i = last;
-                        blocks = process_math(start, i, de_tilde, math, blocks);
-                    }
-                    start = null;
-                    end = null;
-                    last = null;
-                    braces = 0;
-                }
-                else if (block === "{") {
-                    braces++;
-                }
-                else if (block === "}" && braces) {
-                    braces--;
-                }
-            }
-            else {
-                //
-                //  Look for math start delimiters and when
-                //    found, set up the end delimiter.
-                //
-                if (block === "$" || block === "$$") {
-                    start = i;
-                    end = block;
-                    braces = 0;
-                }
-                else if (block === "\\\\\(" || block === "\\\\\[") {
-                    start = i;
-                    end = block.slice(-1) === "(" ? "\\\\\)" : "\\\\\]";
-                    braces = 0;
-                }
-                else if (block.substr(1, 5) === "begin") {
-                    start = i;
-                    end = "\\end" + block.substr(6);
-                    braces = 0;
-                }
-            }
-        }
-        if (last) {
-            blocks = process_math(start, last, de_tilde, math, blocks);
-            start  = null;
-            end    = null;
-            last   = null;
-        }
-        return [de_tilde(blocks.join("")), math];
-    };
-
-    //
-    //  Put back the math strings that were saved,
-    //    and clear the math array (no need to keep it around).
-    //
-    var replace_math = function (text, math) {
-        //
-        //  Replaces a math placeholder with its corresponding group.
-        //  The math delimiters "\\(", "\\[", "\\)" and "\\]" are replaced
-        //  removing one backslash in order to be interpreted correctly by MathJax.
-        //
-        var math_group_process = function (match, n) {
-            var math_group = math[n];
-
-            if (math_group.substr(0, 3) === "\\\\\("  && math_group.substr(math_group.length - 3) === "\\\\\)") {
-                math_group = "\\\(" + math_group.substring(3, math_group.length - 3) + "\\\)";
-            } else if (math_group.substr(0, 3) === "\\\\\[" && math_group.substr(math_group.length - 3) === "\\\\\]") {
-                math_group = "\\\[" + math_group.substring(3, math_group.length - 3) + "\\\]";
-            }
-            
-            return math_group;
-        };
-
-        // Replace all the math group placeholders in the text
-        // with the saved strings.
-        text = text.replace(/@@(\d+)@@/g, math_group_process);
-        
-        return text;
-    };
-
-    var mathjaxutils = {
-        init : init,
-        remove_math : remove_math,
-        replace_math : replace_math
-    };
-
-    return mathjaxutils;
-});
diff --git a/notebook/static/base/js/namespace.js b/notebook/static/base/js/namespace.js
deleted file mode 100644
index fc2f471b1..000000000
--- a/notebook/static/base/js/namespace.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-
-var Jupyter = Jupyter || {};
-
-var jprop = function(name, module_path){
-    Object.defineProperty(Jupyter, name, {
-      get: function() { 
-          console.warn('accessing `'+name+'` is deprecated. Use `requirejs("'+module_path+'")`');
-          return requirejs(module_path); 
-      },
-      enumerable: true,
-      configurable: false
-    });
-}
-
-var jglobal = function(name, module_path){
-    Object.defineProperty(Jupyter, name, {
-      get: function() { 
-          console.warn('accessing `'+name+'` is deprecated. Use `requirejs("'+module_path+'").'+name+'`');
-          return requirejs(module_path)[name]; 
-      },
-      enumerable: true,
-      configurable: false
-    });
-}
-
-define(function(){
-    "use strict";
-
-    // expose modules
-    
-    jprop('utils','base/js/utils')
-    jprop('mathjaxutils','base/js/mathjaxutils');
-
-    //Jupyter.load_extensions = Jupyter.utils.load_extensions;
-    // 
-    jprop('security','base/js/security');
-    jprop('keyboard','base/js/keyboard');
-    jprop('dialog','base/js/dialog');
-
-
-    //// exposed constructors
-    jglobal('CommManager','services/kernels/comm')
-    jglobal('Comm','services/kernels/comm')
-
-    jglobal('NotificationWidget','base/js/notificationwidget');
-    jglobal('Kernel','services/kernels/kernel');
-    jglobal('Session','services/sessions/session');
-    jglobal('LoginWidget','auth/js/loginwidget');
-    jglobal('Page','base/js/page');
-
-    // notebook
-    jglobal('TextCell','notebook/js/textcell');
-    jglobal('OutputArea','notebook/js/outputarea');
-    jglobal('KeyboardManager','notebook/js/keyboardmanager');
-    jglobal('Completer','notebook/js/completer');
-    jglobal('Notebook','notebook/js/notebook');
-    jglobal('Tooltip','notebook/js/tooltip');
-    jglobal('Toolbar','notebook/js/toolbar');
-    jglobal('SaveWidget','notebook/js/savewidget');
-    jglobal('Pager','notebook/js/pager');
-    jglobal('QuickHelp','notebook/js/quickhelp');
-    jglobal('MarkdownCell','notebook/js/textcell');
-    jglobal('RawCell','notebook/js/textcell');
-    jglobal('Cell','notebook/js/cell');
-    jglobal('MainToolBar','notebook/js/maintoolbar');
-    jglobal('NotebookNotificationArea','notebook/js/notificationarea');
-    jglobal('NotebookTour', 'notebook/js/tour');
-    jglobal('MenuBar', 'notebook/js/menubar');
-
-    // tree
-    jglobal('SessionList','tree/js/sessionlist');
-
-    Jupyter.version = "6.4.13.dev0";
-    Jupyter._target = '_blank';
-
-    return Jupyter;
-});
-
-// deprecated since 4.0, remove in 5+
-var IPython = Jupyter;
diff --git a/notebook/static/base/js/notificationarea.js b/notebook/static/base/js/notificationarea.js
deleted file mode 100644
index c3d8528ee..000000000
--- a/notebook/static/base/js/notificationarea.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/notificationwidget',
-], function($, notificationwidget) {
-    "use strict";
-
-    // store reference to the NotificationWidget class
-    var NotificationWidget = notificationwidget.NotificationWidget;
-
-    /**
-     * Construct the NotificationArea object. Options are:
-     *     events: $(Events) instance
-     *     save_widget: SaveWidget instance
-     *     notebook: Notebook instance
-     *     keyboard_manager: KeyboardManager instance
-     *
-     * @constructor
-     * @param {string} selector - a jQuery selector string for the
-     * notification area element
-     * @param {Object} [options] - a dictionary of keyword arguments.
-     */
-    var NotificationArea = function (selector, options) {
-        this.selector = selector;
-        this.events = options.events;
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-        }
-        this.widget_dict = {};
-    };
-
-    /**
-     * Get a widget by name, creating it if it doesn't exist.
-     *
-     * @method widget
-     * @param {string} name - the widget name
-     */
-    NotificationArea.prototype.widget = function (name) {
-        if (this.widget_dict[name] === undefined) {
-            return this.new_notification_widget(name);
-        }
-        return this.get_widget(name);
-    };
-
-    /**
-     * Get a widget by name, throwing an error if it doesn't exist.
-     *
-     * @method get_widget
-     * @param {string} name - the widget name
-     */
-    NotificationArea.prototype.get_widget = function (name) {
-        if(this.widget_dict[name] === undefined) {
-            throw new Error('no widgets with this name');
-        }
-        return this.widget_dict[name];
-    };
-
-    /**
-     * Create a new notification widget with the given name. The
-     * widget must not already exist.
-     *
-     * @method new_notification_widget
-     * @param {string} name - the widget name
-     */
-    NotificationArea.prototype.new_notification_widget = function (name) {
-        if (this.widget_dict[name] !== undefined) {
-            throw new Error('widget with that name already exists!');
-        }
-
-        // create the element for the notification widget and add it
-        // to the notification aread element
-        var div = $('<div/>').attr('id', 'notification_' + name);
-        $(this.selector).append(div);
-
-        // create the widget object and return it
-        this.widget_dict[name] = new NotificationWidget('#notification_' + name);
-        return this.widget_dict[name];
-    };
-
-    return {'NotificationArea': NotificationArea};
-});
diff --git a/notebook/static/base/js/notificationwidget.js b/notebook/static/base/js/notificationwidget.js
deleted file mode 100644
index 71549b828..000000000
--- a/notebook/static/base/js/notificationwidget.js
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define(['jquery'], function($) {
-    "use strict";
-
-    /**
-     * Construct a NotificationWidget object.
-     *
-     * @constructor
-     * @param {string} selector - a jQuery selector string for the
-     * notification widget element
-     */
-    var NotificationWidget = function (selector) {
-        this.selector = selector;
-        this.timeout = null;
-        this.busy = false;
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.style();
-        }
-        this.element.hide();
-        this.inner = $('<span/>');
-        this.element.append(this.inner);
-    };
-
-    /**
-     * Add the 'notification_widget' CSS class to the widget element.
-     *
-     * @method style
-     */
-    NotificationWidget.prototype.style = function () {
-        // use explicit bootstrap classes here,
-        // because multiple inheritance in LESS doesn't work
-        // for this particular combination
-        this.element.addClass('notification_widget btn btn-xs navbar-btn');
-    };
-   
-    /**
-     * hide the widget and empty the text
-     **/
-    NotificationWidget.prototype.hide = function () {
-        var that = this;
-        this.element.fadeOut(100, function(){that.inner.text('');});
-    };
-
-    /**
-     * Set the notification widget message to display for a certain
-     * amount of time (timeout).  The widget will be shown forever if
-     * timeout is <= 0 or undefined. If the widget is clicked while it
-     * is still displayed, execute an optional callback
-     * (click_callback). If the callback returns false, it will
-     * prevent the notification from being dismissed.
-     *
-     * Options:
-     *    class - CSS class name for styling
-     *    icon - CSS class name for the widget icon
-     *    title - HTML title attribute for the widget
-     *
-     * @method set_message
-     * @param {string} msg - The notification to display
-     * @param {integer} [timeout] - The amount of time in milliseconds to display the widget
-     * @param {function} [click_callback] - The function to run when the widget is clicked
-     * @param {Object} [options] - Additional options
-     */
-    NotificationWidget.prototype.set_message = function (msg, timeout, click_callback, options) {
-        options = options || {};
-
-        // unbind potential previous callback
-        this.element.unbind('click');
-        this.inner.attr('class', options.icon);
-        this.inner.attr('title', options.title);
-        this.inner.text(msg);
-        this.element.fadeIn(100);
-
-        // reset previous set style
-        this.element.removeClass();
-        this.style();
-        if (options.class) {
-            this.element.addClass(options.class);
-        }
-
-        // clear previous timer
-        if (this.timeout !== null) {
-            clearTimeout(this.timeout);
-            this.timeout = null;
-        }
-
-        // set the timer if a timeout is given
-        var that = this;
-        if (timeout !== undefined && timeout >= 0) {
-            this.timeout = setTimeout(function () {
-                that.element.fadeOut(100, function () {that.inner.text('');});
-                that.element.unbind('click');
-                that.timeout = null;
-            }, timeout);
-        }
-
-        // if no click callback assume we will just dismiss the notification
-        if (click_callback === undefined) {
-            click_callback = function(){return true};
-        }
-        // on click, remove widget if click callback say so
-        // and unbind click event.
-        this.element.click(function () {
-            if (click_callback() !== false) {
-                that.element.fadeOut(100, function () {that.inner.text('');});
-                that.element.unbind('click');
-            }
-            if (that.timeout !== null) {
-                clearTimeout(that.timeout);
-                that.timeout = null;
-            }
-        });
-    };
-
-    /**
-     * Display an information message (styled with the 'info'
-     * class). Arguments are the same as in set_message. Default
-     * timeout is 3500 milliseconds.
-     *
-     * @method info
-     */
-    NotificationWidget.prototype.info = function (msg, timeout, click_callback, options) {
-        options = options || {};
-        options.class = options.class + ' info';
-        timeout = timeout || 3500;
-        this.set_message(msg, timeout, click_callback, options);
-    };
-
-    /**
-     * Display a warning message (styled with the 'warning'
-     * class). Arguments are the same as in set_message. Messages are
-     * sticky by default.
-     *
-     * @method warning
-     */
-    NotificationWidget.prototype.warning = function (msg, timeout, click_callback, options) {
-        options = options || {};
-        options.class = options.class + ' warning';
-        this.set_message(msg, timeout, click_callback, options);
-    };
-
-    /**
-     * Display a danger message (styled with the 'danger'
-     * class). Arguments are the same as in set_message. Messages are
-     * sticky by default.
-     *
-     * @method danger
-     */
-    NotificationWidget.prototype.danger = function (msg, timeout, click_callback, options) {
-        options = options || {};
-        options.class = options.class + ' danger';
-        this.set_message(msg, timeout, click_callback, options);
-    };
-
-    /**
-     * Get the text of the widget message.
-     *
-     * @method get_message
-     * @return {string} - the message text
-     */
-    NotificationWidget.prototype.get_message = function () {
-        return this.inner.html();
-    };
-
-    return {'NotificationWidget': NotificationWidget};
-});
diff --git a/notebook/static/base/js/page.js b/notebook/static/base/js/page.js
deleted file mode 100644
index 62935e1ab..000000000
--- a/notebook/static/base/js/page.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/events',
-], function($, events){
-    "use strict";
-
-    var Page = function (header_div_selector, site_div_selector) {
-        /**
-        * Constructor
-        *
-        * Parameters
-        * header_div_selector: string
-        * site_div_selector: string
-        */
-        this.header_div_element = $(header_div_selector || 'div#header');
-        this.site_div_element = $(site_div_selector || 'div#site');
-
-        this.bind_events();
-    };
-
-    Page.prototype.bind_events = function () {
-        // resize site on:
-        // - window resize
-        // - header change
-        // - page load
-        var _handle_resize = $.proxy(this._resize_site, this);
-
-        $(window).resize(_handle_resize);
-
-        // On document ready, resize codemirror.
-        $(document).ready(_handle_resize);
-        events.on('resize-header.Page', _handle_resize);
-    };
-
-    Page.prototype.show = function () {
-        /**
-         * The header and site divs start out hidden to prevent FLOUC.
-         * Main scripts should call this method after styling everything.
-         */
-        this.show_header();
-        this.show_site();
-    };
-
-    Page.prototype.show_header = function () {
-        /**
-         * The header and site divs start out hidden to prevent FLOUC.
-         * Main scripts should call this method after styling everything.
-         */
-        this.header_div_element.css('display','block');
-    };
-
-    Page.prototype.show_site = function () {
-        /**
-         * The header and site divs start out hidden to prevent FLOUC.
-         * Main scripts should call this method after styling everything.
-         */
-        this.site_div_element.css('display', 'block');
-        this._resize_site();
-    };
-
-    Page.prototype._resize_site = function(e) {
-        /**
-         * Update the site's size.
-         */
-
-        // In the case an event is passed in, only trigger if the event does
-        // *not* have a target DOM node (i.e., it is not bubbling up). See
-        // https://bugs.jquery.com/ticket/9841#comment:8
-        if (!(e && e.target && e.target.tagName)) {
-            $('div#site').height($(window).height() - $('#header').height());
-        }
-    };
-
-    return {'Page': Page};
-});
diff --git a/notebook/static/base/js/promises.js b/notebook/static/base/js/promises.js
deleted file mode 100644
index b8100e4e6..000000000
--- a/notebook/static/base/js/promises.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-// Define an object to attach promises to for one-time events.
-
-define(['base/js/events', 'base/js/namespace'], function(events, Jupyter) {
-    "use strict";
-
-    // Promise to be resolved when the application is initialized.
-    // The value is the name of the app on the current page.
-    var app_initialized = new Promise(function(resolve, reject) {
-        events.on('app_initialized.NotebookApp', function() {
-            resolve('NotebookApp');
-        });
-        events.on('app_initialized.DashboardApp', function() {
-            resolve('DashboardApp');
-        });
-    });
-
-    var promises = {
-        app_initialized: app_initialized
-    };
-    Jupyter.promises = promises;
-
-    return promises;
-});
diff --git a/notebook/static/base/js/security.js b/notebook/static/base/js/security.js
deleted file mode 100644
index 7d01321ce..000000000
--- a/notebook/static/base/js/security.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'components/sanitizer/index',
-], function($, sanitizer) {
-    "use strict";
-
-    var noop = function (x) { return x; };
-    var defaultSanitizer = sanitizer.defaultSanitizer;
-
-    var sanitize_html = function (html, allow_css) {
-        /**
-         * sanitize HTML
-         * if allow_css is true (default: false), CSS is sanitized as well.
-         * otherwise, CSS elements and attributes are simply removed.
-         */
-         const options = {};
-         if (!allow_css) {
-             options.allowedStyles = {};
-         }
-        return defaultSanitizer.sanitize(html, options);
-    };
-
-    var sanitize_html_and_parse = function (html, allow_css) {
-        /**
-         * Sanitize HTML and parse it safely using jQuery.
-         *
-         * This disable's jQuery's html 'prefilter', which can make invalid
-         * HTML valid after the sanitizer has checked it.
-         *
-         * Returns an array of DOM nodes.
-         */
-        var sanitized_html = sanitize_html(html, allow_css);
-        var prev_htmlPrefilter = $.htmlPrefilter;
-        $.htmlPrefilter = function(html) {return html;};  // Don't modify HTML
-        try {
-            return $.parseHTML(sanitized_html);
-        } finally {
-            $.htmlPrefilter = prev_htmlPrefilter;  // Set it back again
-        }
-    };
-
-    var security = {
-        sanitize_html_and_parse: sanitize_html_and_parse,
-        sanitize_html: sanitize_html
-    };
-
-    return security;
-});
diff --git a/notebook/static/base/js/utils.js b/notebook/static/base/js/utils.js
deleted file mode 100644
index 1d8a9d010..000000000
--- a/notebook/static/base/js/utils.js
+++ /dev/null
@@ -1,1243 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'codemirror/lib/codemirror',
-    'moment',
-    'underscore',
-    // silently upgrades CodeMirror
-    'codemirror/mode/meta',
-], function($, CodeMirror, moment, _){
-    "use strict";
-    
-    // keep track of which extensions have been loaded already
-    var extensions_loaded = [];
-
-    /**
-     * Whether or not an extension has been loaded
-     * @param  {string} extension - name of the extension
-     * @return {boolean}            true if loaded already
-     */
-    var is_loaded = function(extension) {
-        var ext_path = "nbextensions/" + extension;
-        return extensions_loaded.indexOf(ext_path) >= 0;
-    };
-
-    /**
-     * Load a single extension.
-     * @param  {string} extension - extension path.
-     * @return {Promise} that resolves to an extension module handle
-     */
-    var load_extension = function (extension) {
-        return new Promise(function(resolve, reject) {
-            var ext_path = "nbextensions/" + extension;
-            requirejs([ext_path], function(module) {
-                if (!is_loaded(extension)) {
-                    console.log("Loading extension: " + extension);
-                    if (module && module.load_ipython_extension) {
-                        Promise.resolve(module.load_ipython_extension()).then(function() {
-                            resolve(module);
-                        }).catch(reject);
-                    }
-                    extensions_loaded.push(ext_path);
-                } else {
-                    console.log("Loaded extension already: " + extension);
-                    resolve(module);
-                }
-            }, function(err) {
-                reject(err);
-            });
-        });
-    };
-
-    /**
-     * Load multiple extensions.
-     * Takes n-args, where each arg is a string path to the extension.
-     * @return {Promise} that resolves to a list of loaded module handles.
-     */
-    var load_extensions = function () {
-        console.log('load_extensions', arguments);
-        return Promise.all(Array.prototype.map.call(arguments, load_extension)).catch(function(err) {
-            console.error("Failed to load extension" + (err.requireModules.length>1?'s':'') + ":", err.requireModules, err);
-        });
-    };
-
-    /**
-     * Return a list of extensions that should be active
-     * The config for nbextensions comes in as a dict where keys are
-     * nbextensions paths and the values are a bool indicating if it
-     * should be active. This returns a list of nbextension paths
-     * where the value is true
-     */
-    function filter_extensions(nbext_config) {
-        var active = [];
-        Object.keys(nbext_config).forEach(function (nbext) {
-            if (nbext_config[nbext]) {active.push(nbext);}
-        });
-        return active;
-    }
-
-    /**
-     * Wait for a config section to load, and then load the extensions specified
-     * in a 'load_extensions' key inside it.
-     */
-    function load_extensions_from_config(section) {
-        return section.loaded.then(function() {
-            if (section.data.load_extensions) {
-                var active = filter_extensions(section.data.load_extensions);
-                return load_extensions.apply(this, active);
-            }
-        }).catch(utils.reject('Could not load nbextensions from ' + section.section_name + ' config file'));
-    }
-
-    //============================================================================
-    // Cross-browser RegEx Split
-    //============================================================================
-
-    // This code has been MODIFIED from the code licensed below to not replace the
-    // default browser split.  The license is reproduced here.
-
-    // see http://blog.stevenlevithan.com/archives/cross-browser-split for more info:
-    /*!
-     * Cross-Browser Split 1.1.1
-     * Copyright 2007-2012 Steven Levithan <stevenlevithan.com>
-     * Available under the MIT License
-     * ECMAScript compliant, uniform cross-browser split method
-     */
-
-    /**
-     * Splits a string into an array of strings using a regex or string
-     * separator. Matches of the separator are not included in the result array.
-     * However, if `separator` is a regex that contains capturing groups,
-     * backreferences are spliced into the result each time `separator` is
-     * matched. Fixes browser bugs compared to the native
-     * `String.prototype.split` and can be used reliably cross-browser.
-     * @param {String} str String to split.
-     * @param {RegExp} separator Regex to use for separating
-     *     the string.
-     * @param {Number} [limit] Maximum number of items to include in the result
-     *     array.
-     * @returns {Array} Array of substrings.
-     * @example
-     *
-     * // Basic use
-     * regex_split('a b c d', ' ');
-     * // -> ['a', 'b', 'c', 'd']
-     *
-     * // With limit
-     * regex_split('a b c d', ' ', 2);
-     * // -> ['a', 'b']
-     *
-     * // Backreferences in result array
-     * regex_split('..word1 word2..', /([a-z]+)(\d+)/i);
-     * // -> ['..', 'word', '1', ' ', 'word', '2', '..']
-     */
-    var regex_split = function (str, separator, limit) {
-        var output = [],
-            flags = (separator.ignoreCase ? "i" : "") +
-                    (separator.multiline  ? "m" : "") +
-                    (separator.extended   ? "x" : "") + // Proposed for ES6
-                    (separator.sticky     ? "y" : ""), // Firefox 3+
-            lastLastIndex = 0,
-            separator2, match, lastIndex, lastLength;
-        // Make `global` and avoid `lastIndex` issues by working with a copy
-        separator = new RegExp(separator.source, flags + "g");
-
-        var compliantExecNpcg = typeof(/()??/.exec("")[1]) === "undefined";
-        if (!compliantExecNpcg) {
-            // Doesn't need flags gy, but they don't hurt
-            separator2 = new RegExp("^" + separator.source + "$(?!\\s)", flags);
-        }
-        /* Values for `limit`, per the spec:
-         * If undefined: 4294967295 // Math.pow(2, 32) - 1
-         * If 0, Infinity, or NaN: 0
-         * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
-         * If negative number: 4294967296 - Math.floor(Math.abs(limit))
-         * If other: Type-convert, then use the above rules
-         */
-        limit = typeof(limit) === "undefined" ?
-            -1 >>> 0 : // Math.pow(2, 32) - 1
-            limit >>> 0; // ToUint32(limit)
-        for (match = separator.exec(str); match; match = separator.exec(str)) {
-            // `separator.lastIndex` is not reliable cross-browser
-            lastIndex = match.index + match[0].length;
-            if (lastIndex > lastLastIndex) {
-                output.push(str.slice(lastLastIndex, match.index));
-                // Fix browsers whose `exec` methods don't consistently return `undefined` for
-                // nonparticipating capturing groups
-                if (!compliantExecNpcg && match.length > 1) {
-                    match[0].replace(separator2, function () {
-                        for (var i = 1; i < arguments.length - 2; i++) {
-                            if (typeof(arguments[i]) === "undefined") {
-                                match[i] = undefined;
-                            }
-                        }
-                    });
-                }
-                if (match.length > 1 && match.index < str.length) {
-                    Array.prototype.push.apply(output, match.slice(1));
-                }
-                lastLength = match[0].length;
-                lastLastIndex = lastIndex;
-                if (output.length >= limit) {
-                    break;
-                }
-            }
-            if (separator.lastIndex === match.index) {
-                separator.lastIndex++; // Avoid an infinite loop
-            }
-        }
-        if (lastLastIndex === str.length) {
-            if (lastLength || !separator.test("")) {
-                output.push("");
-            }
-        } else {
-            output.push(str.slice(lastLastIndex));
-        }
-        return output.length > limit ? output.slice(0, limit) : output;
-    };
-
-    //============================================================================
-    // End contributed Cross-browser RegEx Split
-    //============================================================================
-
-
-    var uuid = function () {
-        /**
-         * http://www.ietf.org/rfc/rfc4122.txt
-         */
-        var s = [];
-        var hexDigits = "0123456789abcdef";
-        for (var i = 0; i < 32; i++) {
-            s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-        }
-        s[12] = "4";  // bits 12-15 of the time_hi_and_version field to 0010
-        s[16] = hexDigits.substr((s[16] & 0x3) | 0x8, 1);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
-
-        var uuid = s.join("");
-        return uuid;
-    };
-
-    var _ANSI_COLORS = [
-        "ansi-black",
-        "ansi-red",
-        "ansi-green",
-        "ansi-yellow",
-        "ansi-blue",
-        "ansi-magenta",
-        "ansi-cyan",
-        "ansi-white",
-        "ansi-black-intense",
-        "ansi-red-intense",
-        "ansi-green-intense",
-        "ansi-yellow-intense",
-        "ansi-blue-intense",
-        "ansi-magenta-intense",
-        "ansi-cyan-intense",
-        "ansi-white-intense",
-    ];
-    
-    function _pushColoredChunk(chunk, fg, bg, bold, underline, inverse, out) {
-        if (chunk) {
-            var classes = [];
-            var styles = [];
-
-            if (bold && typeof fg === "number" && 0 <= fg && fg < 8) {
-                fg += 8;  // Bold text uses "intense" colors
-            }
-            if (inverse) {
-                [fg, bg] = [bg, fg];
-            }
-
-            if (typeof fg === "number") {
-                classes.push(_ANSI_COLORS[fg] + "-fg");
-            } else if (fg.length) {
-                styles.push("color: rgb(" + fg + ")");
-            } else if (inverse) {
-                classes.push("ansi-default-inverse-fg");
-            }
-
-            if (typeof bg === "number") {
-                classes.push(_ANSI_COLORS[bg] + "-bg");
-            } else if (bg.length) {
-                styles.push("background-color: rgb(" + bg + ")");
-            } else if (inverse) {
-                classes.push("ansi-default-inverse-bg");
-            }
-
-            if (bold) {
-                classes.push("ansi-bold");
-            }
-
-            if (underline) {
-                classes.push("ansi-underline");
-            }
-
-            if (classes.length || styles.length) {
-                out.push("<span");
-                if (classes.length) {
-                    out.push(' class="' + classes.join(" ") + '"');
-                }
-                if (styles.length) {
-                    out.push(' style="' + styles.join("; ") + '"');
-                }
-                out.push(">");
-                out.push(chunk);
-                out.push("</span>");
-            } else {
-                out.push(chunk);
-            }
-        }
-    }
-
-    function _getExtendedColors(numbers) {
-        var r, g, b;
-        var n = numbers.shift();
-        if (n === 2 && numbers.length >= 3) {
-            // 24-bit RGB
-            r = numbers.shift();
-            g = numbers.shift();
-            b = numbers.shift();
-            if ([r, g, b].some(function (c) { return c < 0 || 255 < c; })) {
-                throw new RangeError("Invalid range for RGB colors");
-            }
-        } else if (n === 5 && numbers.length >= 1) {
-            // 256 colors
-            var idx = numbers.shift();
-            if (idx < 0) {
-                throw new RangeError("Color index must be >= 0");
-            } else if (idx < 16) {
-                // 16 default terminal colors
-                return idx;
-            } else if (idx < 232) {
-                // 6x6x6 color cube, see https://stackoverflow.com/a/27165165/500098
-                r = Math.floor((idx - 16) / 36);
-                r = r > 0 ? 55 + r * 40 : 0;
-                g = Math.floor(((idx - 16) % 36) / 6);
-                g = g > 0 ? 55 + g * 40 : 0;
-                b = (idx - 16) % 6;
-                b = b > 0 ? 55 + b * 40 : 0;
-            } else if (idx < 256) {
-                // grayscale, see https://stackoverflow.com/a/27165165/500098
-                r = g = b = (idx - 232) * 10 + 8;
-            } else {
-                throw new RangeError("Color index must be < 256");
-            }
-        } else {
-            throw new RangeError("Invalid extended color specification");
-        }
-        return [r, g, b];
-    }
-
-    function _ansispan(str) {
-        var ansi_re = /\x1b\[(.*?)([@-~])/g;
-        var fg = [];
-        var bg = [];
-        var bold = false;
-        var underline = false;
-        var inverse = false;
-        var match;
-        var out = [];
-        var numbers = [];
-        var start = 0;
-
-        str += "\x1b[m";  // Ensure markup for trailing text
-        while ((match = ansi_re.exec(str))) {
-            if (match[2] === "m") {
-                var items = match[1].split(";");
-                for (var i = 0; i < items.length; i++) {
-                    var item = items[i];
-                    if (item === "") {
-                        numbers.push(0);
-                    } else if (item.search(/^\d+$/) !== -1) {
-                        numbers.push(parseInt(item));
-                    } else {
-                        // Ignored: Invalid color specification
-                        numbers.length = 0;
-                        break;
-                    }
-                }
-            } else {
-                // Ignored: Not a color code
-            }
-            var chunk = str.substring(start, match.index);
-	    _pushColoredChunk(chunk, fg, bg, bold, underline, inverse, out);
-            start = ansi_re.lastIndex;
-
-            while (numbers.length) {
-                var n = numbers.shift();
-                switch (n) {
-                    case 0:
-                        fg = bg = [];
-                        bold = false;
-                        underline = false;
-                        inverse = false;
-                        break;
-                    case 1:
-                    case 5:
-                        bold = true;
-                        break;
-                    case 4:
-                        underline = true;
-                        break;
-                    case 7:
-                        inverse = true;
-                        break;
-                    case 21:
-                    case 22:
-                        bold = false;
-                        break;
-                    case 24:
-                        underline = false;
-                        break;
-                    case 27:
-                        inverse = false;
-                        break;
-                    case 30:
-                    case 31:
-                    case 32:
-                    case 33:
-                    case 34:
-                    case 35:
-                    case 36:
-                    case 37:
-                        fg = n - 30;
-                        break;
-                    case 38:
-                        try {
-                            fg = _getExtendedColors(numbers);
-                        } catch(e) {
-                            numbers.length = 0;
-                        }
-                        break;
-                    case 39:
-                        fg = [];
-                        break;
-                    case 40:
-                    case 41:
-                    case 42:
-                    case 43:
-                    case 44:
-                    case 45:
-                    case 46:
-                    case 47:
-                        bg = n - 40;
-                        break;
-                    case 48:
-                        try {
-                            bg = _getExtendedColors(numbers);
-                        } catch(e) {
-                            numbers.length = 0;
-                        }
-                        break;
-                    case 49:
-                        bg = [];
-                        break;
-		    case 90:
-		    case 91:
-		    case 92:
-		    case 93:
-		    case 94:
-		    case 95:
-		    case 96:
-		    case 97:
-			fg = n - 90 + 8;
-                        break;
-		    case 100:
-		    case 101:
-		    case 102:
-		    case 103:
-		    case 104:
-		    case 105:
-		    case 106:
-		    case 107:
-			bg = n - 100 + 8;
-                        break;
-                    default:
-                        // Unknown codes are ignored
-                }
-            }
-        }
-        return out.join("");
-    }
-
-    // Transform ANSI color escape codes into HTML <span> tags with CSS
-    // classes such as "ansi-green-intense-fg".
-    // The actual colors used are set in the CSS file.
-    // This is supposed to have the same behavior as nbconvert.filters.ansi2html()
-    function fixConsole(txt) {
-        txt = _.escape(txt);
-
-        // color ansi codes (and remove non-color escape sequences)
-        txt = _ansispan(txt);
-        return txt;
-    }
-
-    // Remove chunks that should be overridden by the effect of
-    // carriage return characters
-    function fixCarriageReturn(txt) {
-        txt = txt.replace(/\r+\n/gm, '\n'); // \r followed by \n --> newline
-        while (txt.search(/\r[^$]/g) > -1) {
-            var base = txt.match(/^(.*)\r+/m)[1];
-            var insert = txt.match(/\r+(.*)$/m)[1];
-            insert = insert + base.slice(insert.length, base.length);
-            txt = txt.replace(/\r+.*$/m, '\r').replace(/^.*\r/m, insert);
-        }
-        return txt;
-    }
-
-    // Remove characters that are overridden by backspace characters
-    function fixBackspace(txt) {
-        var tmp = txt;
-        do {
-            txt = tmp;
-            // Cancel out anything-but-newline followed by backspace
-            tmp = txt.replace(/[^\n]\x08/gm, '');
-        } while (tmp.length < txt.length);
-        return txt;
-    }
-
-    // Remove characters overridden by backspace and carriage return
-    function fixOverwrittenChars(txt) {
-        return fixCarriageReturn(fixBackspace(txt));
-    }
-
-    // Locate any URLs and convert them to an anchor tag
-    function autoLinkUrls(txt) {
-        return txt.replace(/(^|\s)(https?|ftp)(:[^'"<>\s]+)/gi,
-            "$1<a target=\"_blank\" href=\"$2$3\">$2$3</a>");
-    }
-
-    var points_to_pixels = function (points) {
-        /**
-         * A reasonably good way of converting between points and pixels.
-         */
-        var test = $('<div style="display: none; width: 10000pt; padding:0; border:0;"></div>');
-        $('body').append(test);
-        var pixel_per_point = test.width()/10000;
-        test.remove();
-        return Math.floor(points*pixel_per_point);
-    };
-    
-    var always_new = function (constructor) {
-        /**
-         * wrapper around contructor to avoid requiring `var a = new constructor()`
-         * useful for passing constructors as callbacks,
-         * not for programmer laziness.
-         * from https://programmers.stackexchange.com/questions/118798
-         */
-        return function () {
-            var obj = Object.create(constructor.prototype);
-            constructor.apply(obj, arguments);
-            return obj;
-        };
-    };
-
-    var url_path_join = function () {
-        /**
-         * join a sequence of url components with '/'
-         */
-        var url = '';
-        for (var i = 0; i < arguments.length; i++) {
-            if (arguments[i] === '') {
-                continue;
-            }
-            if (url.length > 0 && url[url.length-1] != '/') {
-                url = url + '/' + arguments[i];
-            } else {
-                url = url + arguments[i];
-            }
-        }
-        url = url.replace(/\/\/+/, '/');
-        return url;
-    };
-    
-    var url_path_split = function (path) {
-        /**
-         * Like os.path.split for URLs.
-         * Always returns two strings, the directory path and the base filename
-         */
-        
-        var idx = path.lastIndexOf('/');
-        if (idx === -1) {
-            return ['', path];
-        } else {
-            return [ path.slice(0, idx), path.slice(idx + 1) ];
-        }
-    };
-    
-    var parse_url = function (url) {
-        /**
-         * an `a` element with an href allows attr-access to the parsed segments of a URL
-         * a = parse_url("http://localhost:8888/path/name#hash")
-         * a.protocol = "http:"
-         * a.host     = "localhost:8888"
-         * a.hostname = "localhost"
-         * a.port     = 8888
-         * a.pathname = "/path/name"
-         * a.hash     = "#hash"
-         */
-        var a = document.createElement("a");
-        a.href = url;
-        return a;
-    };
-    
-    var encode_uri_components = function (uri) {
-        /**
-         * encode just the components of a multi-segment uri,
-         * leaving '/' separators
-         */
-        return uri.split('/').map(encodeURIComponent).join('/');
-    };
-    
-    var url_join_encode = function () {
-        /**
-         * join a sequence of url components with '/',
-         * encoding each component with encodeURIComponent
-         */
-        return encode_uri_components(url_path_join.apply(null, arguments));
-    };
-
-
-    var splitext = function (filename) {
-        /**
-         * mimic Python os.path.splitext
-         * Returns ['base', '.ext']
-         */
-        var idx = filename.lastIndexOf('.');
-        if (idx > 0) {
-            return [filename.slice(0, idx), filename.slice(idx)];
-        } else {
-            return [filename, ''];
-        }
-    };
-
-
-    var escape_html = function (text) {
-        /**
-         * escape text to HTML
-         */
-        return $("<div/>").text(text).html();
-    };
-
-
-    var get_body_data = function(key) {
-        /**
-         * get a url-encoded item from body.data and decode it
-         * we should never have any encoded URLs anywhere else in code
-         * until we are building an actual request
-         */
-        var val = $('body').data(key);
-        if (typeof val === 'undefined')
-            return val;
-        return decodeURIComponent(val);
-    };
-    
-    var to_absolute_cursor_pos = function (cm, cursor) {
-        console.warn('`utils.to_absolute_cursor_pos(cm, pos)` is deprecated. Use `cm.indexFromPos(cursor)`');
-        return cm.indexFromPos(cursor);
-    };
-    
-    var from_absolute_cursor_pos = function (cm, cursor_pos) {
-        console.warn('`utils.from_absolute_cursor_pos(cm, pos)` is deprecated. Use `cm.posFromIndex(index)`');
-        return cm.posFromIndex(cursor_pos);
-    };
-    
-    // https://stackoverflow.com/questions/2400935/browser-detection-in-javascript
-    var browser = (function() {
-        if (typeof navigator === 'undefined') {
-            // navigator undefined in node
-            return 'None';
-        }
-        var N= navigator.appName, ua= navigator.userAgent, tem;
-        var M= ua.match(/(opera|chrome|safari|firefox|msie)\/?\s*(\.?\d+(\.\d+)*)/i);
-        if (M && (tem= ua.match(/version\/([\.\d]+)/i)) !== null) M[2]= tem[1];
-        M= M? [M[1], M[2]]: [N, navigator.appVersion,'-?'];
-        return M;
-    })();
-
-    // https://stackoverflow.com/questions/11219582/how-to-detect-my-browser-version-and-operating-system-using-javascript
-    var platform = (function () {
-        if (typeof navigator === 'undefined') {
-            // navigator undefined in node
-            return 'None';
-        }
-        var OSName="None";
-        if (navigator.appVersion.indexOf("Win")!=-1) OSName="Windows";
-        if (navigator.appVersion.indexOf("Mac")!=-1) OSName="MacOS";
-        if (navigator.appVersion.indexOf("X11")!=-1) OSName="UNIX";
-        if (navigator.appVersion.indexOf("Linux")!=-1) OSName="Linux";
-        return OSName;
-    })();
-    
-    var get_url_param = function (name) {
-        // get a URL parameter. I cannot believe we actually need this.
-        // Based on https://stackoverflow.com/a/25359264/938949
-        var match = new RegExp('[?&]' + name + '=([^&]*)').exec(window.location.search);
-        if (match){
-            return decodeURIComponent(match[1] || '');
-        }
-    };
-    
-    var is_or_has = function (a, b) {
-        /**
-         * Is b a child of a or a itself?
-         */
-        return a.has(b).length !==0 || a.is(b);
-    };
-
-    var is_focused = function (e) {
-        /**
-         * Is element e, or one of its children focused?
-         */
-        e = $(e);
-        var target = $(document.activeElement);
-        if (target.length > 0) {
-            if (is_or_has(e, target)) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    };
-    
-    var mergeopt = function(_class, options, overwrite){
-        options = options || {};
-        overwrite = overwrite || {};
-        return $.extend(true, {}, _class.options_default, options, overwrite);
-    };
-    
-    var ajax_error_msg = function (jqXHR) {
-        /**
-         * Return a JSON error message if there is one,
-         * otherwise the basic HTTP status text.
-         */
-        if (jqXHR.responseJSON && jqXHR.responseJSON.traceback) {
-            return jqXHR.responseJSON.traceback;
-        } else if (jqXHR.responseJSON && jqXHR.responseJSON.message) {
-            return jqXHR.responseJSON.message;
-        } else {
-            return jqXHR.statusText;
-        }
-    };
-    var log_ajax_error = function (jqXHR, status, error) {
-        /**
-         * log ajax failures with informative messages
-         */
-        var msg = "API request failed (" + jqXHR.status + "): ";
-        console.log(jqXHR);
-        msg += ajax_error_msg(jqXHR);
-        console.log(msg);
-    };
-
-    var requireCodeMirrorMode = function (mode, callback, errback) {
-        /** 
-         * find a predefined mode or detect from CM metadata then
-         * require and callback with the resolvable mode string: mime or
-         * custom name
-         */
-
-        var modename = (typeof mode == "string") ? mode :
-            mode.mode || mode.name;
-
-        // simplest, cheapest check by mode name: mode may also have config
-        if (CodeMirror.modes.hasOwnProperty(modename)) {
-            // return the full mode object, if it has a name
-            callback(mode.name ? mode : modename);
-            return;
-        }
-
-        // *somehow* get back a CM.modeInfo-like object that has .mode and
-        // .mime
-        var info = (mode && mode.mode && mode.mime && mode) ||
-            CodeMirror.findModeByName(modename) ||
-            CodeMirror.findModeByExtension(modename.split(".").slice(-1)[0]) ||
-            CodeMirror.findModeByMIME(modename) ||
-            {mode: modename, mime: modename};
-
-        requirejs([
-                // might want to use CodeMirror.modeURL here
-                ['codemirror/mode', info.mode, info.mode].join('/'),
-            ], function() {
-              // return the original mode, as from a kernelspec on first load
-              // or the mimetype, as for most highlighting
-              callback(mode.name ? mode : info.mime);
-            }, errback
-        );
-    };
-    
-    /** Error type for wrapped XHR errors. */
-    var XHR_ERROR = 'XhrError';
-    
-    /**
-     * Wraps an AJAX error as an Error object.
-     */
-    var wrap_ajax_error = function (jqXHR, status, error) {
-        var wrapped_error = new Error(ajax_error_msg(jqXHR));
-        wrapped_error.name =  XHR_ERROR;
-        // provide xhr response
-        wrapped_error.xhr = jqXHR;
-        wrapped_error.xhr_status = status;
-        wrapped_error.xhr_error = error;
-        return wrapped_error;
-    };
-    
-    var ajax = function (url, settings) {
-        // like $.ajax, but ensure XSRF or Authorization header is set
-        if (typeof url === "object") {
-            // called with single argument: $.ajax({url: '...'})
-            settings = url;
-            url = settings.url;
-            delete settings.url;
-        }
-        settings = _add_auth_header(settings);
-        return $.ajax(url, settings);
-    };
-    
-    var _get_cookie = function (name) {
-        // from tornado docs: http://www.tornadoweb.org/en/stable/guide/security.html
-        var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
-        return r ? r[1] : undefined;
-    }
-
-    var _add_auth_header = function (settings) {
-        /**
-         * Adds auth header to jquery ajax settings
-         */
-        settings = settings || {};
-        if (!settings.headers) {
-            settings.headers = {};
-        }
-        if (!settings.headers.Authorization) {
-            var xsrf_token = _get_cookie('_xsrf');
-            if (xsrf_token) {
-                settings.headers['X-XSRFToken'] = xsrf_token;
-            }
-        }
-        return settings;
-    };
-
-    var promising_ajax = function(url, settings) {
-        /**
-         * Like $.ajax, but returning an ES6 promise. success and error settings
-         * will be ignored.
-         */
-        settings = settings || {};
-        return new Promise(function(resolve, reject) {
-            settings.success = function(data, status, jqXHR) {
-                resolve(data);
-            };
-            settings.error = function(jqXHR, status, error) {
-                log_ajax_error(jqXHR, status, error);
-                reject(wrap_ajax_error(jqXHR, status, error));
-            };
-            ajax(url, settings);
-        });
-    };
-
-    var WrappedError = function(message, error){
-        /**
-         * Wrappable Error class
-         *
-         * The Error class doesn't actually act on `this`.  Instead it always
-         * returns a new instance of Error.  Here we capture that instance so we
-         * can apply it's properties to `this`.
-         */
-        var tmp = Error.apply(this, [message]);
-
-        // Copy the properties of the error over to this.
-        var properties = Object.getOwnPropertyNames(tmp);
-        for (var i = 0; i < properties.length; i++) {
-            this[properties[i]] = tmp[properties[i]];
-        }
-
-        // Keep a stack of the original error messages.
-        if (error instanceof WrappedError) {
-            this.error_stack = error.error_stack;
-        } else {
-            this.error_stack = [error];
-        }
-        this.error_stack.push(tmp);
-
-        return this;
-    };
-
-    WrappedError.prototype = Object.create(Error.prototype, {});
-
-
-    var load_class = function(class_name, module_name, registry) {
-        /**
-         * Tries to load a class
-         *
-         * Tries to load a class from a module using require.js, if a module 
-         * is specified, otherwise tries to load a class from the global 
-         * registry, if the global registry is provided.
-         */
-        return new Promise(function(resolve, reject) {
-
-            // Try loading the view module using require.js
-            if (module_name) {
-                requirejs([module_name], function(module) {
-                    if (module[class_name] === undefined) {
-                        reject(new Error('Class '+class_name+' not found in module '+module_name));
-                    } else {
-                        resolve(module[class_name]);
-                    }
-                }, reject);
-            } else {
-                if (registry && registry[class_name]) {
-                    resolve(registry[class_name]);
-                } else {
-                    reject(new Error('Class '+class_name+' not found in registry '));
-                }
-            }
-        });
-    };
-
-    var resolve_promises_dict = function(d) {
-        /**
-         * Resolve a promiseful dictionary.
-         * Returns a single Promise.
-         */
-        var keys = Object.keys(d);
-        var values = [];
-        keys.forEach(function(key) {
-            values.push(d[key]);
-        });
-        return Promise.all(values).then(function(v) {
-            d = {};
-            for(var i=0; i<keys.length; i++) {
-                d[keys[i]] = v[i];
-            }
-            return d;
-        });
-    };
-
-    var reject = function(message, log) {
-        /**
-         * Creates a wrappable Promise rejection function.
-         * 
-         * Creates a function that returns a Promise.reject with a new WrappedError
-         * that has the provided message and wraps the original error that 
-         * caused the promise to reject.
-         */
-        return function(error) { 
-            var wrapped_error = new WrappedError(message, error);
-            if (log) {
-                console.error(message, " -- ", error);
-            }
-            return Promise.reject(wrapped_error); 
-        };
-    };
-
-    var typeset = function(element, text) {
-        /**
-         * Apply MathJax rendering to an element, and optionally set its text
-         *
-         * If MathJax is not available, make no changes.
-         *
-         * Returns the output any number of typeset elements, or undefined if
-         * MathJax was not available.
-         *
-         * Parameters
-         * ----------
-         * element: Node, NodeList, or jQuery selection
-         * text: option string
-         */
-        var $el = element.jquery ? element : $(element);
-        if(arguments.length > 1){
-            $el.text(text);
-        }
-        if(!window.MathJax){
-            return;
-        }
-        $el.map(function(){
-            // MathJax takes a DOM node: $.map makes `this` the context
-            MathJax.Hub.Queue(["Typeset", MathJax.Hub, this]);
-            try {
-                MathJax.Hub.Queue(
-                    ["Require", MathJax.Ajax, "[MathJax]/extensions/TeX/AMSmath.js"],
-                    function() { MathJax.InputJax.TeX.resetEquationNumbers(); }
-                );
-            } catch (e) {
-                console.error("Error queueing resetEquationNumbers:", e);
-            }
-        });
-    };
-
-    var parse_b64_data_uri = function(uri) {
-        /**
-         * Parses a base64 encoded data-uri to extract mimetype and the
-         * base64 string.
-         *
-         * For example, given 'data:image/png;base64,iVBORw', it will return
-         * ["image/png", "iVBORw"]
-         *
-         * Parameters
-         */
-        // For performance reasons, the non-greedy ? qualifiers are crucial so
-        // that the matcher stops early on big blobs. Without them, it will try
-        // to match the whole blob which can take ages
-        var regex = /^data:(.+?\/.+?);base64,/;
-        var matches = uri.match(regex);
-        var mime = matches[1];
-        // matches[0] contains the whole data-uri prefix
-        var b64_data = uri.slice(matches[0].length);
-        return [mime, b64_data];
-    };
-    
-    var time = {};
-    time.milliseconds = {};
-    time.milliseconds.s = 1000;
-    time.milliseconds.m = 60 * time.milliseconds.s;
-    time.milliseconds.h = 60 * time.milliseconds.m;
-    time.milliseconds.d = 24 * time.milliseconds.h;
-    
-    time.thresholds = {
-        // moment.js thresholds in milliseconds
-        s: moment.relativeTimeThreshold('s') * time.milliseconds.s,
-        m: moment.relativeTimeThreshold('m') * time.milliseconds.m,
-        h: moment.relativeTimeThreshold('h') * time.milliseconds.h,
-        d: moment.relativeTimeThreshold('d') * time.milliseconds.d,
-    };
-    
-    time.timeout_from_dt = function (dt) {
-        /** compute a timeout based on dt
-        
-        input and output both in milliseconds
-        
-        use moment's relative time thresholds:
-        
-        - 10 seconds if in 'seconds ago' territory
-        - 1 minute if in 'minutes ago'
-        - 1 hour otherwise
-        */
-        if (dt < time.thresholds.s) {
-            return 10 * time.milliseconds.s;
-        } else if (dt < time.thresholds.m) {
-            return time.milliseconds.m;
-        } else {
-            return time.milliseconds.h;
-        }
-    };
-
-    var format_datetime = function(date) {
-        var text = moment(date).fromNow();
-        return text === 'a few seconds ago' ? 'seconds ago' : text;
-    };
-
-    var datetime_sort_helper = function(a, b, order) {
-        if (moment(a).isBefore(moment(b))) {
-            return (order == 1) ? -1 : 1;
-        } else if (moment(a).isSame(moment(b))) {
-            return 0;
-        } else {
-            return (order == 1) ? 1 : -1;
-        }
-    };
-    
-    /**
-    source: https://github.com/sindresorhus/pretty-bytes
-    The MIT License (MIT)
-
-    Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-    **/
-    var format_filesize = function(num) {
-      if (num === undefined || num === null)
-        return;
-
-      var UNITS = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-
-      if (!Number.isFinite(num)) {
-        console.error("Expected finite number, got ", typeof(num) + ": " + num);
-      }
-
-      var neg = num < 0;
-
-      if (neg) {
-        num = -num;
-      }
-
-      if (num < 1) {
-        return (neg ? '-' : '') + num + ' B';
-      }
-
-      var exponent = Math.min(Math.floor(Math.log10(num) / 3), UNITS.length - 1);
-      var numStr = Number((num / Math.pow(1000, exponent)).toPrecision(3));
-      var unit = UNITS[exponent];
-
-      return (neg ? '-' : '') + numStr + ' ' + unit;
-    }
-
-    // javascript stores text as utf16 and string indices use "code units",
-    // which stores high-codepoint characters as "surrogate pairs",
-    // which occupy two indices in the javascript string.
-    // We need to translate cursor_pos in the protocol (in characters)
-    // to js offset (with surrogate pairs taking two spots).
-    function js_idx_to_char_idx (js_idx, text) {
-        var char_idx = js_idx;
-        for (var i = 0; i + 1 < text.length && i < js_idx; i++) {
-            var char_code = text.charCodeAt(i);
-            // check for surrogate pair
-            if (char_code >= 0xD800 && char_code <= 0xDBFF) {
-                var next_char_code = text.charCodeAt(i+1);
-                if (next_char_code >= 0xDC00 && next_char_code <= 0xDFFF) {
-                    char_idx--;
-                    i++;
-                }
-            }
-        }
-        return char_idx;
-    }
-
-    function char_idx_to_js_idx (char_idx, text) {
-        var js_idx = char_idx;
-        for (var i = 0; i + 1 < text.length && i < js_idx; i++) {
-            var char_code = text.charCodeAt(i);
-            // check for surrogate pair
-            if (char_code >= 0xD800 && char_code <= 0xDBFF) {
-                var next_char_code = text.charCodeAt(i+1);
-                if (next_char_code >= 0xDC00 && next_char_code <= 0xDFFF) {
-                    js_idx++;
-                    i++;
-                }
-            }
-        }
-        return js_idx;
-    }
-
-    if ('𝐚'.length === 1) {
-        // If javascript fixes string indices of non-BMP characters,
-        // don't keep shifting offsets to compensate for surrogate pairs
-        char_idx_to_js_idx = js_idx_to_char_idx = function (idx, text) { return idx; };
-    }
-
-    // Test if a drag'n'drop event contains a file (as opposed to an HTML
-    // element/text from the document)
-    var dnd_contain_file = function(event) {
-        // As per the HTML5 drag'n'drop spec, the dataTransfer.types should
-        // contain one "Files" type if a file is being dragged
-        // https://www.w3.org/TR/2011/WD-html5-20110113/dnd.html#dom-datatransfer-types
-        if (event.dataTransfer.types) {
-            for (var i = 0; i < event.dataTransfer.types.length; i++) {
-                if (event.dataTransfer.types[i] == "Files") {
-                    return true;
-                }
-            }
-        }
-        return false;
-    };
-
-    var throttle = function(fn, time) {
-      var pending = null;
-
-      return function () {
-        if (pending) return;
-        pending = setTimeout(run, time);
-
-        return function () {
-          clearTimeout(pending);
-          pending = null;
-        }
-      }
-
-      function run () {
-        pending = null;
-        fn();
-      }
-    }
-    
-    var change_favicon = function (src) {
-        var link = document.createElement('link'),
-            oldLink = document.getElementById('favicon');
-        link.id = 'favicon';
-        link.type = 'image/x-icon';
-        link.rel = 'shortcut icon';
-        link.href = utils.url_path_join(utils.get_body_data('baseUrl'), src);
-        if (oldLink && (link.href === oldLink.href)) {
-            // This favicon is already set, don't modify the DOM.
-            return;
-        }
-        if (oldLink) document.head.removeChild(oldLink);
-        document.head.appendChild(link);
-    };
-
-    var utils = {
-        throttle: throttle,
-        is_loaded: is_loaded,
-        load_extension: load_extension,
-        load_extensions: load_extensions,
-        filter_extensions: filter_extensions,
-        load_extensions_from_config: load_extensions_from_config,
-        regex_split : regex_split,
-        uuid : uuid,
-        fixConsole : fixConsole,
-        fixCarriageReturn : fixCarriageReturn,
-        fixBackspace : fixBackspace,
-        fixOverwrittenChars: fixOverwrittenChars,
-        autoLinkUrls : autoLinkUrls,
-        points_to_pixels : points_to_pixels,
-        get_body_data : get_body_data,
-        parse_url : parse_url,
-        url_path_split : url_path_split,
-        url_path_join : url_path_join,
-        url_join_encode : url_join_encode,
-        encode_uri_components : encode_uri_components,
-        splitext : splitext,
-        escape_html : escape_html,
-        always_new : always_new,
-        to_absolute_cursor_pos : to_absolute_cursor_pos,
-        from_absolute_cursor_pos : from_absolute_cursor_pos,
-        browser : browser,
-        platform: platform,
-        get_url_param: get_url_param,
-        is_or_has : is_or_has,
-        is_focused : is_focused,
-        mergeopt: mergeopt,
-        requireCodeMirrorMode : requireCodeMirrorMode,
-        XHR_ERROR : XHR_ERROR,
-        ajax : ajax,
-        ajax_error_msg : ajax_error_msg,
-        log_ajax_error : log_ajax_error,
-        wrap_ajax_error : wrap_ajax_error,
-        promising_ajax : promising_ajax,
-        WrappedError: WrappedError,
-        load_class: load_class,
-        resolve_promises_dict: resolve_promises_dict,
-        reject: reject,
-        typeset: typeset,
-        parse_b64_data_uri: parse_b64_data_uri,
-        time: time,
-        format_datetime: format_datetime,
-        format_filesize: format_filesize,
-        datetime_sort_helper: datetime_sort_helper,
-        dnd_contain_file: dnd_contain_file,
-        js_idx_to_char_idx: js_idx_to_char_idx,
-        char_idx_to_js_idx: char_idx_to_js_idx,
-        _ansispan:_ansispan,
-        change_favicon: change_favicon
-    };
-
-    return utils;
-}); 
diff --git a/notebook/static/base/less/error.less b/notebook/static/base/less/error.less
deleted file mode 100644
index 33b8c995c..000000000
--- a/notebook/static/base/less/error.less
+++ /dev/null
@@ -1,24 +0,0 @@
-div.error {
-  margin: 2em;
-  text-align: center;
-}
-
-div.error > h1 {
-    font-size: 500%;
-    line-height: normal;
-}
-
-div.error > p {
-    font-size: 200%;
-    line-height: normal;
-}
-
-div.traceback-wrapper {
-    text-align: left;
-    max-width: 800px;
-    margin: auto;
-    pre.traceback {
-      max-height: 600px;
-      overflow: auto;
-    }
-}
diff --git a/notebook/static/base/less/flexbox.less b/notebook/static/base/less/flexbox.less
deleted file mode 100644
index 3dae44e41..000000000
--- a/notebook/static/base/less/flexbox.less
+++ /dev/null
@@ -1,269 +0,0 @@
-
-/* Flexible box model classes */
-/* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */
-
-/* This file is a compatibility layer.  It allows the usage of flexible box 
-model layouts accross multiple browsers, including older browsers.  The newest,
-universal implementation of the flexible box model is used when available (see
-`Modern browsers` comments below).  Browsers that are known to implement this 
-new spec completely include:
-
-    Firefox 28.0+
-    Chrome 29.0+
-    Internet Explorer 11+ 
-    Opera 17.0+
-
-Browsers not listed, including Safari, are supported via the styling under the
-`Old browsers` comments below.
-*/
-
-
-.hbox {
-    /* Old browsers */
-    display: -webkit-box;
-    -webkit-box-orient: horizontal;
-    -webkit-box-align: stretch;
-
-    display: -moz-box;
-    -moz-box-orient: horizontal;
-    -moz-box-align: stretch;
-
-    display: box;
-    box-orient: horizontal;
-    box-align: stretch;
-
-    /* Modern browsers */
-    display: flex;
-    flex-direction: row;
-    align-items: stretch;
-}
-
-.hbox > * {
-    /* Old browsers */
-    -webkit-box-flex: 0;
-    -moz-box-flex: 0;
-    box-flex: 0;
-
-    /* Modern browsers */
-    flex: none;
-}
-
-.vbox {
-    /* Old browsers */
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-box-align: stretch;
-
-    display: -moz-box;
-    -moz-box-orient: vertical;
-    -moz-box-align: stretch;
-
-    display: box;
-    box-orient: vertical;
-    box-align: stretch;
-
-    /* Modern browsers */
-    display: flex;
-    flex-direction: column;
-    align-items: stretch;
-}
-
-.vbox > * {
-    /* Old browsers */
-    -webkit-box-flex: 0;
-    -moz-box-flex: 0;
-    box-flex: 0;
-    
-    /* Modern browsers */
-    flex: none;
-}
-
-.hbox.reverse,
-.vbox.reverse,
-.reverse {
-    /* Old browsers */
-    -webkit-box-direction: reverse;
-    -moz-box-direction: reverse;
-    box-direction: reverse;
-    
-    /* Modern browsers */
-    flex-direction: row-reverse;
-}
-
-.hbox.box-flex0,
-.vbox.box-flex0,
-.box-flex0 {
-    /* Old browsers */
-    -webkit-box-flex: 0;
-    -moz-box-flex: 0;
-    box-flex: 0;
-    
-    /* Modern browsers */
-    flex: none;
-    width: auto;
-}
-
-.hbox.box-flex1,
-.vbox.box-flex1,
-.box-flex1 {
-    /* Old browsers */
-    -webkit-box-flex: 1;
-    -moz-box-flex: 1;
-    box-flex: 1;
-
-    /* Modern browsers */
-    flex: 1;
-}
-
-.hbox.box-flex,
-.vbox.box-flex,
-.box-flex {
-    /* Old browsers */
-    .box-flex1();
-}
-
-.hbox.box-flex2,
-.vbox.box-flex2,
-.box-flex2 {
-    /* Old browsers */
-    -webkit-box-flex: 2;
-    -moz-box-flex: 2;
-    box-flex: 2;
-
-    /* Modern browsers */
-    flex: 2;
-}
-
-.box-group1 {
-    /*  Deprecated */
-    -webkit-box-flex-group: 1;
-    -moz-box-flex-group: 1;
-    box-flex-group: 1;
-}
-
-.box-group2 {
-    /* Deprecated */
-    -webkit-box-flex-group: 2;
-    -moz-box-flex-group: 2;
-    box-flex-group: 2;
-}
-
-.hbox.start, 
-.vbox.start,
-.start {
-    /* Old browsers */
-    -webkit-box-pack: start;
-    -moz-box-pack: start;
-    box-pack: start;
-    
-    /* Modern browsers */
-    justify-content: flex-start;
-}
-
-.hbox.end, 
-.vbox.end,
-.end {
-    /* Old browsers */
-    -webkit-box-pack: end;
-    -moz-box-pack: end;
-    box-pack: end;
-    
-    /* Modern browsers */
-    justify-content: flex-end;
-}
-
-.hbox.center, 
-.vbox.center,
-.center {
-    /* Old browsers */
-    -webkit-box-pack: center;
-    -moz-box-pack: center;
-    box-pack: center;
-    
-    /* Modern browsers */
-    justify-content: center;
-}
-
-.hbox.baseline, 
-.vbox.baseline,
-.baseline {
-    /* Old browsers */
-    -webkit-box-pack: baseline;
-    -moz-box-pack: baseline;
-    box-pack: baseline;
-    
-    /* Modern browsers */
-    justify-content: baseline;
-}
-
-.hbox.stretch, 
-.vbox.stretch,
-.stretch {
-    /* Old browsers */
-    -webkit-box-pack: stretch;
-    -moz-box-pack: stretch;
-    box-pack: stretch;
-    
-    /* Modern browsers */
-    justify-content: stretch;
-}
-
-.hbox.align-start, 
-.vbox.align-start,
-.align-start {
-    /* Old browsers */
-    -webkit-box-align: start;
-    -moz-box-align: start;
-    box-align: start;
-    
-    /* Modern browsers */
-    align-items: flex-start;
-}
-
-.hbox.align-end, 
-.vbox.align-end,
-.align-end {
-    /* Old browsers */
-    -webkit-box-align: end;
-    -moz-box-align: end;
-    box-align: end;
-    
-    /* Modern browsers */
-    align-items: flex-end;
-}
-
-.hbox.align-center, 
-.vbox.align-center,
-.align-center {
-    /* Old browsers */
-    -webkit-box-align: center;
-    -moz-box-align: center;
-    box-align: center;
-    
-    /* Modern browsers */
-    align-items: center;
-}
-
-.hbox.align-baseline, 
-.vbox.align-baseline,
-.align-baseline {
-    /* Old browsers */
-    -webkit-box-align: baseline;
-    -moz-box-align: baseline;
-    box-align: baseline;
-    
-    /* Modern browsers */
-    align-items: baseline;
-}
-
-.hbox.align-stretch, 
-.vbox.align-stretch,
-.align-stretch {
-    /* Old browsers */
-    -webkit-box-align: stretch;
-    -moz-box-align: stretch;
-    box-align: stretch;
-    
-    /* Modern browsers */
-    align-items: stretch;
-}
diff --git a/notebook/static/base/less/mixins.less b/notebook/static/base/less/mixins.less
deleted file mode 100644
index 85fe43498..000000000
--- a/notebook/static/base/less/mixins.less
+++ /dev/null
@@ -1,19 +0,0 @@
-// Mixin CSS classes
-
-.border-box-sizing {
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-}
-
-.corner-all {
-    border-radius: @border-radius-base;
-}
-
-.border-radius(@radius) {
-  border-radius: @radius;
-}
-
-.no-padding {
-    padding: 0px;
-}
diff --git a/notebook/static/base/less/page.less b/notebook/static/base/less/page.less
deleted file mode 100644
index 570aeb74c..000000000
--- a/notebook/static/base/less/page.less
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Primary styles
- *
- * Author: Jupyter Development Team
- */
-
-
-body {
-    background-color: @body-bg;
-    /* This makes sure that the body covers the entire window and needs to
-       be in a different element than the display: box in wrapper below */
-    position: absolute;
-    left: 0px;
-    right: 0px;
-    top: 0px;
-    bottom: 0px;
-    overflow: visible;
-}
-
-body > #header {
-    /* Initially hidden to prevent FLOUC */
-    display: none;
-    background-color: @body-bg;
-
-    /* Display over codemirror */
-    position: relative;
-    z-index: 100;
-
-    #header-container {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        padding: 5px;
-        padding-bottom: 5px;
-        padding-top: 5px;
-        .border-box-sizing();
-    }
-
-    .header-bar {
-        width: 100%;
-        height: 1px;
-        background: @navbar-default-border;
-        margin-bottom: -1px;
-    }
-
-    @media print {
-        display: none !important;
-    }
-}
-
-#header-spacer {
-    width: 100%;
-    visibility: hidden;
-    
-    @media print {
-        display: none;
-    }
-}
-
-#ipython_notebook {
-    padding-left: 0px;
-    padding-top: (@navbar-height - @logo_height) / 2;
-    padding-bottom: (@navbar-height - @logo_height) / 2;
-}
-
-[dir="rtl"] #ipython_notebook {
-    margin-right: 10px;
-    margin-left: 0;
-}
-
-[dir="rtl"] #ipython_notebook.pull-left {
-     .pull-right();
-}
-
-.flex-spacer {
-    flex: 1;
-}
-
-#noscript {
-     width: auto;
-     padding-top: 16px;
-     padding-bottom: 16px;
-     text-align: center;
-     font-size: 22px;
-     color: red;
-     font-weight: bold;
-}
-
-#ipython_notebook img {
-    height: @logo_height;
-}
-
-#site {
-    width: 100%;
-    display: none;
-    .border-box-sizing();
-    overflow: auto;
-    @media print {
-      // force auto-height on print (overrides manual resizing in live view)
-      height: auto !important;
-    }
-}
-
-/* Smaller buttons */
-.ui-button .ui-button-text {
-    padding: 0.2em 0.8em;
-    font-size: 77%;
-}
-
-input.ui-button {
-    padding: 0.3em 0.9em;
-}
-
-span#kernel_logo_widget {
-    margin: 0 10px;
-}
-
-span#login_widget {
-    float: right;
-}
-
-[dir="rtl"] span#login_widget {
-    float: left;
-}
-
-span#login_widget > .button,
-#logout, #shutdown
-{
-    .btn-default();
-    margin-left: 10px;
-}
-
-.nav-header {
-    text-transform: none;
-}
-
-#header > span {
-  margin-top: 10px;
-}
-
-// class for stretching dialogs to fill the screen
-.modal_stretch .modal-dialog {
-    .vbox();
-    min-height: 80vh;
-    .modal-body {
-        // ~"foo" is to avoid less turning this into a weird value
-        max-height: calc(~"100vh - 200px");
-        overflow: auto;
-        flex: 1;
-    }
-}
-
-.modal-header {
-  cursor: move;
-}
-
-@media (min-width: @screen-sm-min) {
-    .modal .modal-dialog {
-        width: 700px;
-    }
-}
-
-// less mixin to be sure to add the right class to get icons with font awesome.
-.icon(@ico){
-    .fa();
-    content: @ico;
-}
-
-@media (min-width: @screen-sm-min) {
-    select.form-control {
-        margin-left: @padding-base-horizontal;
-        margin-right: @padding-base-horizontal;
-    }
-}
-
-/* rtl fixes for the error, connecting, and renaming window */
-
-[dir="rtl"] .modal-footer {
-    text-align : left !important;
-}
-
-[dir="rtl"] .close {
-    float : left;
-}
-
-[dir="rtl"] .fa-step-forward::before {
-    content: "\f048";
-}
diff --git a/notebook/static/base/less/style.less b/notebook/static/base/less/style.less
deleted file mode 100644
index cc77da9be..000000000
--- a/notebook/static/base/less/style.less
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
-*
-* IPython base
-*
-*/
-@import "variables.less";
-@import "mixins.less";
-@import "flexbox.less";
-@import "error.less";
diff --git a/notebook/static/base/less/variables.less b/notebook/static/base/less/variables.less
deleted file mode 100644
index 4cddd082a..000000000
--- a/notebook/static/base/less/variables.less
+++ /dev/null
@@ -1,62 +0,0 @@
-// Our customizations to bootstrap go here.
-
-@black: #000;
-@text-color: @black;
-@font-size-base: 13px;
-@font-family-monospace: monospace;  // to allow user to customize their fonts
-@navbar-height: 30px;
-@breadcrumb-color: darken(@border_color, 30%);
-@blockquote-font-size: inherit;
-@modal-inner-padding: 15px;
-@grid-float-breakpoint: 541px;
-@screen-xs: 540px;
-@logo_height: 28px;
-@border-radius-small: 1px;
-@border-radius-base: 2px;
-@border-radius-large: 3px;
-@grid-gutter-width: 0px;
-@kbd-color: #888;
-@kbd-bg: transparent;
-
-@icon-font-path: "../components/bootstrap/fonts/";
-
-// Disable modal slide-in from top animation.
-.modal {
-  &.fade .modal-dialog {
-    .translate(0, 0);
-  }
-}
-
-// Set the default code color.
-code {
-  color: @black; // default code color in bootstrap is #d14 (crimson / amaranth)
-}
-
-// Override bootstrap pre element styling.
-pre {
-  // bootstrap has pre defaults that we don't want to inherit.
-  // start pre tag defaults based on the surrounding context instead.
-  font-size: inherit;
-  line-height: inherit;
-}
-
-// Disable bold labels in BS3
-label {
-    font-weight: normal;
-}
-
-// Our own global variables for all pages go here
-@global-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
-@global-shadow-dark: 0px 0px 12px 1px rgba(87, 87, 87, 0.4);
-@page-header-padding: 20px;
-/* Make the page background atleast 100% the height of the view port */
-@page-backdrop-height: 100vh;
-/* Make the page itself atleast 70% the height of the view port */
-@page-min-height: 0;
-@page-backdrop-color: #EEE;
-@page-color: @body-bg;
-@page-padding: 15px;
-
-// preven container size to jump from 768px to 720px
-// when window width go from 768 to 769+
-@container-sm : @screen-sm-min;
diff --git a/notebook/static/bidi/bidi.js b/notebook/static/bidi/bidi.js
deleted file mode 100644
index 851fd8e0a..000000000
--- a/notebook/static/bidi/bidi.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define(['bidi/numericshaping'], function(numericshaping) {
-  'use strict';
-
-  var shaperType = '';
-
-  var _uiLang = function() {
-    return navigator.language.toLowerCase();
-  };
-
-  var _loadLocale = function() {
-    if (_isMirroringEnabled()) {
-      document.body.dir = 'rtl';
-    }
-
-    requirejs(['moment'], function (moment) {
-      console.log('Loaded moment locale', moment.locale(_uiLang()));
-    });
-
-    shaperType = _uiLang().split('-')[0] == 'ar' ? 'national' : 'defaultNumeral';
-  };
-
-  var _isMirroringEnabled = function() {
-    return new RegExp('^(ar|ara|arc|ae|ave|egy|he|heb|nqo|pal|phn|sam|syc|syr|fa|per|fas|ckb|ur|urd)').test(_uiLang());
-  };
-
-  /**
-     * @param value : the string to apply the bidi-support on it.
-     * @param flag :indicates the type of bidi-support (Numeric-shaping ,Base-text-dir ).
-     */
-  var _applyBidi = function(value /*, flag*/) {
-    value = numericshaping.shapeNumerals(value, shaperType);
-    return value;
-  };
-
-  var bidi = {
-    applyBidi: _applyBidi,
-    isMirroringEnabled: _isMirroringEnabled,
-    loadLocale: _loadLocale,
-  };
-
-  return bidi;
-});
diff --git a/notebook/static/bidi/numericshaping.js b/notebook/static/bidi/numericshaping.js
deleted file mode 100644
index d78ec0d0d..000000000
--- a/notebook/static/bidi/numericshaping.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([],
-    function(bidi) {
-    "use strict";
-	
-    var regex = /([0-9])|([\u0660-\u0669])|([\u0608\u060B\u060D\u061B-\u064A\u066D-\u066F\u0671-\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FF\u0750-\u077F\u08A0-\u08E3\u200F\u202B\u202E\u2067\uFB50-\uFD3D\uFD40-\uFDCF\uFDF0-\uFDFC\uFDFE-\uFDFF\uFE70-\uFEFE]+)|([^0-9\u0660-\u0669\u0608\u060B\u060D\u061B-\u064A\u066D-\u066F\u0671-\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FF\u0750-\u077F\u08A0-\u08E3\u200F\u202B\u202E\u2067\uFB50-\uFD3D\uFD40-\uFDCF\uFDF0-\uFDFC\uFDFE-\uFDFF\uFE70-\uFEFE\u0600-\u0607\u0609-\u060A\u060C\u060E-\u061A\u064B-\u066C\u0670\u06D6-\u06E4\u06E7-\u06ED\u06F0-\u06F9\u08E4-\u08FF\uFD3E-\uFD3F\uFDD0-\uFDEF\uFDFD\uFEFF\u0000-\u0040\u005B-\u0060\u007B-\u007F\u0080-\u00A9\u00AB-\u00B4\u00B6-\u00B9\u00BB-\u00BF\u00D7\u00F7\u02B9-\u02BA\u02C2-\u02CF\u02D2-\u02DF\u02E5-\u02ED\u02EF-\u02FF\u2070\u2074-\u207E\u2080-\u208E\u2100-\u2101\u2103-\u2106\u2108-\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A-\u213B\u2140-\u2144\u214A-\u214D\u2150-\u215F\u2189\uA720-\uA721\uA788\uFF01-\uFF20\uFF3B-\uFF40\uFF5B-\uFF65\uFFE0-\uFFE6\uFFE8-\uFFEE]+)/g;
-	
-    var shape = function(text, shaperType) {
-        text = text.toString();
-        if (!text) { 
-            return text;
-        }
-        switch (shaperType) {
-            case "defaultNumeral":
-                return _shapeEuropean(text);
-            case "national":
-                return _shapeArabic(text);
-            default:
-                return text;
-        }
-    };
-    
-    var _shapeEuropean = function(text) {
-        return text.replace(/[\u0660-\u0669]/g, function(c) {
-            return c.charCodeAt(0) - 1632;
-        });
-    };
-
-    var _shapeArabic = function(text) {
-        return text.replace(/[0-9]/g, function(c) {
-            return String.fromCharCode(parseInt(c) + 1632);
-        });
-    };
-   
-    var numericshaping = {
-        shapeNumerals : shape
-    };
-           
-    return numericshaping;       
-});
diff --git a/notebook/static/custom/custom.css b/notebook/static/custom/custom.css
deleted file mode 100644
index 908ac7b38..000000000
--- a/notebook/static/custom/custom.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-Placeholder for custom user CSS
-
-mainly to be overridden in profile/static/custom/custom.css
-
-This will always be an empty file
-*/
-
diff --git a/notebook/static/custom/custom.js b/notebook/static/custom/custom.js
deleted file mode 100644
index bfece423e..000000000
--- a/notebook/static/custom/custom.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// leave at least 2 line with only a star on it below, or doc generation fails
-/**
- *
- *
- * Placeholder for custom user javascript
- * mainly to be overridden in profile/static/custom/custom.js
- * This will always be an empty file in IPython
- *
- * User could add any javascript in the `profile/static/custom/custom.js` file.
- * It will be executed by the ipython notebook at load time.
- *
- * Same thing with `profile/static/custom/custom.css` to inject custom css into the notebook.
- *
- *
- * The object available at load time depend on the version of IPython in use.
- * there is no guaranties of API stability.
- *
- * The example below explain the principle, and might not be valid.
- *
- * Instances are created after the loading of this file and might need to be accessed using events:
- *     define([
- *        'base/js/namespace',
- *        'base/js/promises'
- *     ], function(IPython, promises) {
- *         promises.app_initialized.then(function (appName) {
- *             if (appName !== 'NotebookApp') return;
- *             IPython.keyboard_manager....
- *         });
- *     });
- *
- * __Example 1:__
- *
- * Create a custom button in toolbar that execute `%qtconsole` in kernel
- * and hence open a qtconsole attached to the same kernel as the current notebook
- *
- *    define([
- *        'base/js/namespace',
- *        'base/js/promises'
- *    ], function(IPython, promises) {
- *        promises.app_initialized.then(function (appName) {
- *            if (appName !== 'NotebookApp') return;
- *            IPython.toolbar.add_buttons_group([
- *                {
- *                    'label'   : 'run qtconsole',
- *                    'icon'    : 'icon-terminal', // select your icon from http://fortawesome.github.io/Font-Awesome/icons
- *                    'callback': function () {
- *                        IPython.notebook.kernel.execute('%qtconsole')
- *                    }
- *                }
- *                // add more button here if needed.
- *                ]);
- *        });
- *    });
- *
- * __Example 2:__
- *
- * At the completion of the dashboard loading, load an unofficial javascript extension
- * that is installed in profile/static/custom/
- *
- *    define([
- *        'base/js/events'
- *    ], function(events) {
- *        events.on('app_initialized.DashboardApp', function(){
- *            requirejs(['custom/unofficial_extension.js'])
- *        });
- *    });
- *
- *
- *
- * @module IPython
- * @namespace IPython
- * @class customjs
- * @static
- */
diff --git a/notebook/static/edit/js/editor.js b/notebook/static/edit/js/editor.js
deleted file mode 100644
index 886c92be7..000000000
--- a/notebook/static/edit/js/editor.js
+++ /dev/null
@@ -1,370 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/dialog',
-    'codemirror/lib/codemirror',
-    'codemirror/mode/meta',
-    'codemirror/addon/comment/comment',
-    'codemirror/addon/dialog/dialog',
-    'codemirror/addon/edit/closebrackets',
-    'codemirror/addon/edit/matchbrackets',
-    'codemirror/addon/search/searchcursor',
-    'codemirror/addon/search/search',
-    'codemirror/keymap/emacs',
-    'codemirror/keymap/sublime',
-    'codemirror/keymap/vim',
-    ],
-function(
-    $,
-    utils,
-    i18n,
-    dialog,
-    CodeMirror
-) {
-    "use strict";
-
-    var Editor = function(selector, options) {
-        var that = this;
-        this.selector = selector;
-        this.clean = false;
-        this.contents = options.contents;
-        this.events = options.events;
-        this.base_url = options.base_url;
-        this.file_path = options.file_path;
-        this.config = options.config;
-        this.file_extension_modes = options.file_extension_modes || {};
-        this.last_modified = null;
-        this._changed_on_disk_dialog = null;
-
-        this.codemirror = new CodeMirror($(this.selector)[0]);
-        this.codemirror.on('changes', function(cm, changes){
-            that._clean_state();
-        });
-        this.generation = -1;
-        
-        // It appears we have to set commands on the CodeMirror class, not the
-        // instance. I'd like to be wrong, but since there should only be one CM
-        // instance on the page, this is good enough for now.
-        CodeMirror.commands.save = $.proxy(this.save, this);
-        
-        this.save_enabled = false;
-        
-        this.config.loaded.then(function () {
-            // load codemirror config
-            var cfg = that.config.data.Editor || {};
-            var cmopts = $.extend(true, {}, // true = recursive copy
-                Editor.default_codemirror_options,
-                cfg.codemirror_options || {}
-            );
-            that._set_codemirror_options(cmopts);
-            that.events.trigger('config_changed.Editor', {config: that.config});
-            if (cfg.file_extension_modes) {
-                // check for file extension in user preferences
-                var modename = cfg.file_extension_modes[that._get_file_extension()];
-                if (modename) {
-                    var modeinfo = CodeMirror.findModeByName(modename);
-                    if (modeinfo) {
-                        that.set_codemirror_mode(modeinfo);
-                    }
-                }
-            }
-            that._clean_state();
-        });
-        this.clean_sel = $('<div/>');
-        $('.last_modified').before(this.clean_sel);
-        this.clean_sel.addClass('dirty-indicator-dirty');
-    };
-    
-    // default CodeMirror options
-    Editor.default_codemirror_options = {
-        extraKeys: {
-            "Cmd-Right": "goLineRight",
-            "End": "goLineRight",
-            "Cmd-Left": "goLineLeft",
-            "Tab": "indentMore",
-            "Shift-Tab" : "indentLess",
-            "Cmd-/" : "toggleComment",
-            "Ctrl-/" : "toggleComment",
-        },
-        indentUnit: 4,
-        theme: "ipython",
-        lineNumbers: true,
-        lineWrapping: true
-    };
-    
-    Editor.prototype.load = function() {
-        /** load the file */
-        var that = this;
-        var cm = this.codemirror;
-        return this.contents.get(this.file_path, {type: 'file', format: 'text'})
-            .then(function(model) {
-                cm.setValue(model.content);
-
-                // Setting the file's initial value creates a history entry,
-                // which we don't want.
-                cm.clearHistory();
-                that._set_mode_for_model(model);
-                that.save_enabled = true;
-                that.generation = cm.changeGeneration();
-                that.events.trigger("file_loaded.Editor", model);
-                that._clean_state();
-                that.last_modified = new Date(model.last_modified);
-            }).catch(
-            function(error) {
-                that.events.trigger("file_load_failed.Editor", error);
-                console.warn('Error loading: ', error);
-                cm.setValue("Error! " + error.message +
-                                "\nSaving disabled.\nSee Console for more details.");
-                cm.setOption('readOnly','nocursor');
-                that.save_enabled = false;
-            }
-        );
-    };
-    
-    Editor.prototype._set_mode_for_model = function (model) {
-        /** Set the CodeMirror mode based on the file model */
-
-        // Find and load the highlighting mode,
-        // first by mime-type, then by file extension
-
-        var modeinfo;
-        var ext = this._get_file_extension();
-        if (ext) {
-            // check if a mode has been remembered for this extension
-            var modename = this.file_extension_modes[ext];
-            if (modename) {
-                modeinfo = CodeMirror.findModeByName(modename);
-            }
-        }
-        // prioritize CodeMirror's filename identification
-        if (!modeinfo || modeinfo.mode === "null") {
-            modeinfo = CodeMirror.findModeByFileName(model.name);
-            // codemirror's filename identification is case-sensitive.
-            // try once more with lowercase extension
-            if (!modeinfo && ext) {
-                // CodeMirror wants lowercase ext without leading '.'
-                modeinfo = CodeMirror.findModeByExtension(ext.slice(1).toLowerCase());
-            }
-        }
-        if (model.mimetype && (!modeinfo || modeinfo.mode === "null")) {
-            // mimetype is not set on file rename
-            modeinfo = CodeMirror.findModeByMIME(model.mimetype);
-        }
-        if (modeinfo) {
-            this.set_codemirror_mode(modeinfo);
-        }
-    };
-
-    Editor.prototype.set_codemirror_mode = function (modeinfo) {
-        /** set the codemirror mode from a modeinfo struct */
-        var that = this;
-        utils.requireCodeMirrorMode(modeinfo, function () {
-            that.codemirror.setOption('mode', modeinfo.mime);
-            that.events.trigger("mode_changed.Editor", modeinfo);
-        }, function(err) {
-            console.log('Error getting CodeMirror mode: ' + err);
-        });
-    };
-
-    Editor.prototype.save_codemirror_mode = function (modeinfo) {
-        /** save the selected codemirror mode for the current extension in config */
-        var update_mode_map = {};
-        var ext = this._get_file_extension();
-        // no extension, nothing to save
-        // TODO: allow remembering no-extension things like Makefile?
-        if (!ext) return;
-
-        update_mode_map[ext] = modeinfo.name;
-        return this.config.update({
-            Editor: {
-                file_extension_modes: update_mode_map,
-            }
-        });
-    };
-
-    Editor.prototype.get_filename = function () {
-        return utils.url_path_split(this.file_path)[1];
-    };
-
-    Editor.prototype._get_file_extension = function () {
-        /** return file extension *including* . 
-        
-        Returns undefined if no extension is found.
-        */
-        var filename = this.get_filename();
-        var ext_idx = filename.lastIndexOf('.');
-        if (ext_idx < 0) {
-            return;
-        } else {
-            return filename.slice(ext_idx);
-        }
-    };
-
-    /**
-     * Rename the file.
-     * @param  {string} new_name
-     * @return {Promise} promise that resolves when the file is renamed.
-     */
-    Editor.prototype.rename = function (new_name) {
-        /** rename the file */
-        var that = this;
-        var parent = utils.url_path_split(this.file_path)[0];
-        var new_path = utils.url_path_join(parent, new_name);
-        return this.contents.rename(this.file_path, new_path).then(
-            function (model) {
-                that.file_path = model.path;
-                that.events.trigger('file_renamed.Editor', model);
-                that.last_modified = new Date(model.last_modified);
-                that._set_mode_for_model(model);
-                that._clean_state();
-            }
-        );
-    };
-    
-
-    /**
-     * Save this file on the server.
-     *
-     * @param {boolean} check_last_modified - checks if file has been modified on disk
-     * @return {Promise} - promise that resolves when the notebook is saved.
-     */
-    Editor.prototype.save = function (check_last_modified) {
-        /** save the file */
-        if (!this.save_enabled) {
-            console.log("Not saving, save disabled");
-            return;
-        }
-
-        // used to check for last modified saves
-        if (check_last_modified === undefined) {
-            check_last_modified = true;
-        }
-
-        var model = {
-            path: this.file_path,
-            type: 'file',
-            format: 'text',
-            content: this.codemirror.getValue(),
-        };
-        var that = this;
-
-        var _save = function () {
-            that.events.trigger("file_saving.Editor");
-            return that.contents.save(that.file_path, model).then(function(data) {
-                // record change generation for isClean
-                that.generation = that.codemirror.changeGeneration();
-                that.events.trigger("file_saved.Editor", data);
-                that.last_modified = new Date(data.last_modified);
-                that._clean_state();
-            });
-        };
-
-        /* 
-         * Gets the current working file, and checks if the file has been modified on disk. If so, it
-         * creates & opens a modal that issues the user a warning and prompts them to overwrite the file.
-         * 
-         * If it can't get the working file, it builds a new file and saves.
-         */ 
-        if (check_last_modified) {
-            return this.contents.get(that.file_path, {content: false}).then(
-                function check_if_modified(data) {
-                    var last_modified = new Date(data.last_modified);
-                    // We want to check last_modified (disk) > that.last_modified (our last save)
-                    // In some cases the filesystem reports an inconsistent time,
-                    // so we allow 0.5 seconds difference before complaining.
-                    if ((last_modified.getTime() - that.last_modified.getTime()) > 500) {  // 500 ms
-                        console.warn("Last saving was done on `"+that.last_modified+"`("+that._last_modified+"), "+
-                                     "while the current file seem to have been saved on `"+data.last_modified+"`");
-                        if (that._changed_on_disk_dialog !== null) {
-                            // since the modal's event bindings are removed when destroyed, we reinstate
-                            // save & reload callbacks on the confirmation & reload buttons
-                            that._changed_on_disk_dialog.find('.save-confirm-btn').click(_save);
-                            that._changed_on_disk_dialog.find('.btn-warning').click(function () {window.location.reload()});
-                            
-                            // redisplay existing dialog
-                            that._changed_on_disk_dialog.modal('show');
-                        } else {
-                            // create new dialog
-                            that._changed_on_disk_dialog = dialog.modal({
-                                keyboard_manager: that.keyboard_manager,
-                                title: i18n.msg._("File changed"),
-                                body: i18n.msg._("The file has changed on disk since the last time we opened or saved it. "
-                                        + "Do you want to overwrite the file on disk with the version open here, or load "
-                                        + "the version on disk (reload the page)?"),
-                                buttons: {
-                                    Reload: {
-                                        class: 'btn-warning',
-                                        click: function () {
-                                            window.location.reload();
-                                        }
-                                    },
-                                    Cancel: {},
-                                    Overwrite: {
-                                        class: 'btn-danger save-confirm-btn',
-                                        click: function () {
-                                            _save();
-                                        }
-                                    },
-                                }
-                            });
-                        }
-                    } else {
-                        return _save();
-                    }
-            }, function (error) {
-                console.log(error);
-                // maybe it has been deleted or renamed? Go ahead and save.
-                return _save();
-            })
-        } else {
-            return _save();
-        }
-    };
-
-    Editor.prototype._clean_state = function(){
-        var clean = this.codemirror.isClean(this.generation);
-        if (clean === this.clean){
-            return;
-        } else {
-            this.clean = clean;
-        }
-        if(clean){
-            this.events.trigger("save_status_clean.Editor");
-            this.clean_sel.attr('class','dirty-indicator-clean').attr('title','No changes to save');
-        } else {
-            this.events.trigger("save_status_dirty.Editor");
-            this.clean_sel.attr('class','dirty-indicator-dirty').attr('title','Unsaved changes');
-        }
-    };
-
-    Editor.prototype._set_codemirror_options = function (options) {
-        // update codemirror options from a dict
-        var codemirror = this.codemirror;
-        $.map(options, function (value, opt) {
-            if (value === null) {
-                value = CodeMirror.defaults[opt];
-            }
-            codemirror.setOption(opt, value);
-        });
-        var that = this;
-    };
-
-    Editor.prototype.update_codemirror_options = function (options) {
-        /** update codemirror options locally and save changes in config */
-        var that = this;
-        this._set_codemirror_options(options);
-        return this.config.update({
-            Editor: {
-                codemirror_options: options
-            }
-        }).then(
-            that.events.trigger('config_changed.Editor', {config: that.config})
-        );
-    };
-
-    return {Editor: Editor};
-});
diff --git a/notebook/static/edit/js/main.js b/notebook/static/edit/js/main.js
deleted file mode 100644
index 1a7265768..000000000
--- a/notebook/static/edit/js/main.js
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-requirejs([
-    'jquery',
-    'contents',
-    'base/js/namespace',
-    'base/js/utils',
-    'base/js/page',
-    'base/js/events',
-    'services/config',
-    'edit/js/editor',
-    'edit/js/menubar',
-    'edit/js/savewidget',
-    'edit/js/notificationarea',
-    'bidi/bidi',
-    'auth/js/loginwidget', 
-], function(
-    $,
-    contents_service,
-    IPython,
-    utils,
-    page,
-    events,
-    configmod,
-    editmod,
-    menubar,
-    savewidget,
-    notificationarea,
-    bidi,
-    loginwidget,
-    ){
-    "use strict";
-
-    try {
-        requirejs(['custom/custom'], function() {});
-        bidi.loadLocale();
-    } catch(err) {
-        console.log("Error loading custom.js from edition service. Continuing and logging");
-        console.warn(err);
-    }
-    
-    page = new page.Page('div#header', 'div#site');
-
-    var base_url = utils.get_body_data('baseUrl');
-    var file_path = utils.get_body_data('filePath');
-    // This enables logout
-    var login_widget = new loginwidget.LoginWidget('#login_widget', {
-        base_url: base_url
-    });
-    var config = new configmod.ConfigSection('edit', {base_url: base_url});
-    config.load();
-    var common_config = new configmod.ConfigSection('common', {base_url: base_url});
-    common_config.load();
-    var contents = new contents_service.Contents({
-        base_url: base_url,
-        common_config: common_config
-    });
-    
-    var editor = new editmod.Editor('#texteditor-container', {
-        base_url: base_url,
-        events: events,
-        contents: contents,
-        file_path: file_path,
-        config: config,
-    });
-    
-    // Make it available for debugging
-    IPython.editor = editor;
-    
-    var save_widget = new savewidget.SaveWidget('span#save_widget', {
-        editor: editor,
-        events: events,
-    });
-    
-    var menus = new menubar.MenuBar('#menubar', {
-        base_url: base_url,
-        editor: editor,
-        events: events,
-        save_widget: save_widget,
-    });
-    
-    var notification_area = new notificationarea.EditorNotificationArea(
-        '#notification_area', {
-        events: events,
-    });
-    editor.notification_area = notification_area;
-    notification_area.init_notification_widgets();
-
-    utils.load_extensions_from_config(config);
-    utils.load_extensions_from_config(common_config);
-    editor.load();
-    page.show();
-
-    window.onbeforeunload = function () {
-        if (editor.save_enabled && !editor.codemirror.isClean(editor.generation)) {
-            return "Unsaved changes will be lost. Close anyway?";
-        }
-    };
-
-    // Make sure the codemirror editor is sized appropriately.
-    var _handle_resize = function() {
-        var backdrop = $("#texteditor-backdrop");
-
-        // account for padding on the backdrop wrapper
-        var padding = backdrop.outerHeight(true) - backdrop.height();
-        $('div.CodeMirror').height($("#site").height() - padding);
-    };
-    $(window).resize(_handle_resize);
-
-    // On document ready, resize codemirror.
-    $(document).ready(_handle_resize);
-});
diff --git a/notebook/static/edit/js/menubar.js b/notebook/static/edit/js/menubar.js
deleted file mode 100644
index a99e09ef4..000000000
--- a/notebook/static/edit/js/menubar.js
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'base/js/utils',
-    'base/js/dialog',
-    'codemirror/lib/codemirror',
-    'codemirror/mode/meta',
-], function($, IPython, utils, dialog, CodeMirror) {
-    "use strict";
-    
-    var MenuBar = function (selector, options) {
-        /**
-         * Constructor
-         *
-         * A MenuBar Class to generate the menubar of IPython notebook
-         *
-         * Parameters:
-         *  selector: string
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          codemirror: CodeMirror instance
-         *          contents: ContentManager instance
-         *          events: $(Events) instance
-         *          base_url : string
-         *          file_path : string
-         */
-        options = options || {};
-        this.base_url = options.base_url || utils.get_body_data("baseUrl");
-        this.selector = selector;
-        this.editor = options.editor;
-        this.events = options.events;
-        this.save_widget = options.save_widget;
-
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.bind_events();
-        }
-        this._load_mode_menu();
-        Object.seal(this);
-    };
-
-    MenuBar.prototype.bind_events = function () {
-        var that = this;
-        var editor = that.editor;
-        
-        //  File
-        this.element.find('#new-file').click(function () {
-            var w = window.open(undefined, IPython._target);
-            // Create a new file in the current directory
-            var parent = utils.url_path_split(editor.file_path)[0];
-            editor.contents.new_untitled(parent, {type: "file"}).then(
-                function (data) {
-                    w.location = utils.url_path_join(
-                        that.base_url, 'edit', utils.encode_uri_components(data.path)
-                    );
-                },
-                function(error) {
-                    w.close();
-                    dialog.modal({
-                        title : 'Creating New File Failed',
-                        body : "The error was: " + error.message,
-                        buttons : {'OK' : {'class' : 'btn-primary'}}
-                    });
-                }
-            );
-        });
-        this.element.find('#save-file').click(function () {
-            editor.save();
-        });
-        this.element.find('#rename-file').click(function () {
-            that.save_widget.rename();
-        });
-        this.element.find('#download-file').click(function () {
-            window.open(utils.url_path_join(
-                that.base_url, 'files',
-                utils.encode_uri_components(that.editor.file_path)
-            ) + '?download=1');
-        });
-        
-        // Edit
-        this.element.find('#menu-find').click(function () {
-            editor.codemirror.execCommand("find");
-        });
-        this.element.find('#menu-replace').click(function () {
-            editor.codemirror.execCommand("replace");
-        });
-        this.element.find('#menu-keymap-default').click(function () {
-            editor.update_codemirror_options({
-                vimMode: false,
-                keyMap: 'default'
-            });
-        });
-        this.element.find('#menu-keymap-sublime').click(function () {
-            editor.update_codemirror_options({
-                vimMode: false,
-                keyMap: 'sublime'
-            });
-        });
-        this.element.find('#menu-keymap-emacs').click(function () {
-            editor.update_codemirror_options({
-                vimMode: false,
-                keyMap: 'emacs'
-            });
-        });
-        this.element.find('#menu-keymap-vim').click(function () {
-            editor.update_codemirror_options({
-                vimMode: true,
-                keyMap: 'vim'
-            });
-        });
-        
-        // View
-
-        this.element.find('#toggle_header').click(function (){
-            $("#header-container").toggle();
-        });
-        
-        this.element.find('#menu-line-numbers').click(function () {
-            var current = editor.codemirror.getOption('lineNumbers');
-            var value = Boolean(1-current);
-            editor.update_codemirror_options({lineNumbers: value});
-        });
-        
-        this.events.on("config_changed.Editor", function () {
-            var keyMap = editor.codemirror.getOption('keyMap') || 'default';
-            that.element.find(".selected-keymap").removeClass("selected-keymap");
-            that.element.find("#menu-keymap-" + keyMap).addClass("selected-keymap");
-        });
-        
-        this.events.on("mode_changed.Editor", function (evt, modeinfo) {
-            that.element.find("#current-mode")
-                .text(modeinfo.name)
-                .attr(
-                    'title',
-                    "The current language is " + modeinfo.name
-                );
-        });
-    };
-    
-    MenuBar.prototype._load_mode_menu = function () {
-        var list = this.element.find("#mode-menu");
-        var editor = this.editor;
-        function make_set_mode(info) {
-            return function () {
-                editor.set_codemirror_mode(info);
-                // save codemirror mode for extension when explicitly selected
-                editor.save_codemirror_mode(info);
-            };
-        }
-        for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
-            var info = CodeMirror.modeInfo[i];
-            list.append($("<li>").append(
-                $("<a>").attr("href", "#")
-                    .text(info.name)
-                    .click(make_set_mode(info))
-                    .attr('title',
-                        "Set language to " + info.name
-                    )
-            ));
-        }
-    };
-
-    return {'MenuBar': MenuBar};
-});
diff --git a/notebook/static/edit/js/notificationarea.js b/notebook/static/edit/js/notificationarea.js
deleted file mode 100644
index 73f7077d5..000000000
--- a/notebook/static/edit/js/notificationarea.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define([
-    'base/js/notificationarea'
-], function(notificationarea) {
-    "use strict";
-    var NotificationArea = notificationarea.NotificationArea;
-    
-    var EditorNotificationArea = function(selector, options) {
-        NotificationArea.apply(this, [selector, options]);
-    }
-    
-    EditorNotificationArea.prototype = Object.create(NotificationArea.prototype);
-    
-    /**
-     * Initialize the default set of notification widgets.
-     *
-     * @method init_notification_widgets
-     */
-    EditorNotificationArea.prototype.init_notification_widgets = function () {
-        var that = this;
-        var savew = this.new_notification_widget('save');
-        
-        this.events.on("file_saved.Editor", function() {
-            savew.set_message("File saved", 2000);
-        });
-    };
-    
-
-    return {EditorNotificationArea: EditorNotificationArea};
-});
diff --git a/notebook/static/edit/js/savewidget.js b/notebook/static/edit/js/savewidget.js
deleted file mode 100644
index 0c4423a82..000000000
--- a/notebook/static/edit/js/savewidget.js
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/dialog',
-    'base/js/keyboard',
-    'moment',
-    'bidi/bidi',
-], function($, utils, dialog, keyboard, moment, bidi) {
-    "use strict";
-    
-    var SaveWidget = function (selector, options) {
-        this.editor = undefined;
-        this.selector = selector;
-        this.events = options.events;
-        this.editor = options.editor;
-        this._last_modified = undefined;
-        this._filename = undefined;
-        this.keyboard_manager = options.keyboard_manager;
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.bind_events();
-        }
-    };
-
-
-    SaveWidget.prototype.bind_events = function () {
-        var that = this;
-        this.element.find('span.filename').click(function () {
-            that.rename();
-        });
-        this.events.on('save_status_clean.Editor', function (evt) {
-            that.update_document_title();
-        });
-        this.events.on('save_status_dirty.Editor', function (evt) {
-            that.update_document_title(undefined, true);
-        });
-        this.events.on('file_loaded.Editor', function (evt, model) {
-            that.update_filename(model.name);
-            that.update_document_title(model.name);
-            that.update_last_modified(model.last_modified);
-        });
-        this.events.on('file_saved.Editor', function (evt, model) {
-            that.update_filename(model.name);
-            that.update_document_title(model.name);
-            that.update_last_modified(model.last_modified);
-        });
-        this.events.on('file_renamed.Editor', function (evt, model) {
-            that.update_filename(model.name);
-            that.update_document_title(model.name);
-            that.update_address_bar(model.path);
-        });
-        this.events.on('file_save_failed.Editor', function () {
-            that.set_save_status('Save Failed!');
-        });
-    };
-
-
-    SaveWidget.prototype.rename = function (options) {
-        options = options || {};
-        var that = this;
-        var dialog_body = $('<div/>').append(
-            $("<p/>").addClass("rename-message")
-                .text('Enter a new filename:')
-        ).append(
-            $("<br/>")
-        ).append(
-            $('<input/>').attr('type','text').attr('size','25').addClass('form-control')
-            .val(that.editor.get_filename())
-        );
-        var d = dialog.modal({
-            title: "Rename File",
-            body: dialog_body,
-            default_button: "Cancel",
-            buttons : {
-                "Cancel": {},
-                "OK": {
-                    class: "btn-primary",
-                    click: function () {
-                        var new_name = d.find('input').val();
-                        if (!new_name) {
-                            // Reset the message
-                            d.find('.rename-message').text("Enter a new filename:");
-                            return false;
-                        }
-                        d.find('.rename-message').text("Renaming...");
-                        d.find('input[type="text"]').prop('disabled', true);
-                        that.editor.rename(new_name).then(
-                            function () {
-                                d.modal('hide');
-                            }, function (error) {
-                                d.find('.rename-message').text(error.message || 'Unknown error');
-                                d.find('input[type="text"]').prop('disabled', false).focus().select();
-                            }
-                        );
-                        return false;
-                    }
-                }
-            },
-            open : function () {
-                // Upon ENTER, click the OK button.
-                d.find('input[type="text"]').keydown(function (event) {
-                    if (event.which === keyboard.keycodes.enter) {
-                        d.find('.btn-primary').first().click();
-                        return false;
-                    }
-                });
-                d.find('input[type="text"]').focus().select();
-            }
-        });
-    };
-
-
-    SaveWidget.prototype.update_filename = function (filename) {
-    	filename = bidi.applyBidi(filename);
-        this.element.find('span.filename').text(filename);
-    };
-
-    SaveWidget.prototype.update_document_title = function (filename, dirty) {
-        if(filename){
-            this._filename = filename;
-        }
-        document.title = (dirty ? '*' : '') + this._filename + ' - Jupyter Text Editor';
-    };
-
-    SaveWidget.prototype.update_address_bar = function (path) {
-        var state = {path : path};
-        window.history.replaceState(state, "", utils.url_path_join(
-            this.editor.base_url,
-            "edit",
-            utils.encode_uri_components(path)
-        ));
-    };
-
-    SaveWidget.prototype.update_last_modified = function (last_modified) {
-        if (last_modified) {
-            this._last_modified = new Date(last_modified);
-        } else {
-            this._last_modified = null;
-        }
-        this._render_last_modified();
-    };
-    
-    SaveWidget.prototype._render_last_modified = function () {
-        /** actually set the text in the element, from our _last_modified value
-        
-        called directly, and periodically in timeouts.
-        */
-        this._schedule_render_last_modified();
-        var el = this.element.find('span.last_modified');
-        if (!this._last_modified) {
-            el.text('').attr('title', 'never saved');
-            return;
-	 }
-        var chkd = moment(this._last_modified);
-        var long_date = chkd.format('llll');
-        var human_date;
-        var tdelta = Math.ceil(new Date() - this._last_modified);
-        if (tdelta < utils.time.milliseconds.d){
-            // less than 24 hours old, use relative date
-            human_date = chkd.fromNow();
-        } else {
-            // otherwise show calendar
-            // <Today | yesterday|...> at hh,mm,ss
-            human_date = chkd.calendar();
-        }
-        el.text(human_date).attr('title', long_date);
-    };
-    
-    SaveWidget.prototype._schedule_render_last_modified = function () {
-        /** schedule the next update to relative date
-        
-        periodically updated, so short values like 'a few seconds ago' don't get stale.
-        */
-        if (!this._last_modified) {
-            return;
-        }
-        if ((this._last_modified_timeout)) {
-            clearTimeout(this._last_modified_timeout);
-        }
-        var dt = Math.ceil(new Date() - this._last_modified);
-        this._last_modified_timeout = setTimeout(
-            $.proxy(this._render_last_modified, this),
-            utils.time.timeout_from_dt(dt)
-        );
-    };
-
-    return {'SaveWidget': SaveWidget};
-
-});
diff --git a/notebook/static/edit/less/edit.less b/notebook/static/edit/less/edit.less
deleted file mode 100644
index a23f548d0..000000000
--- a/notebook/static/edit/less/edit.less
+++ /dev/null
@@ -1,55 +0,0 @@
-.dirty-indicator{
-    .fa();
-    width:20px;
-}
-.dirty-indicator-dirty{
-    .dirty-indicator();
-}
-
-.dirty-indicator-clean{
-    .dirty-indicator();
-    &:before{
-        .icon(@fa-var-check);
-    }
-}
-
-#filename {
-    font-size: 16pt;
-    display: table;
-    padding: 0px 5px;
-}
-
-#current-mode{
-    padding-left: 5px;
-    padding-right: 5px;
-}
-
-#texteditor-backdrop {
-    padding-top: @page-header-padding;
-    padding-bottom: @page-header-padding;
-    
-    @media not print{
-        background-color: @page-backdrop-color;
-    }
-
-    #texteditor-container {
-        .CodeMirror-gutter, .CodeMirror-gutters {
-            @media print {
-                background-color: @body-bg;
-            }
-            @media not print {
-                background-color: @page-color;
-            }
-        }
-
-        @media not print{
-            padding: 0px;
-            background-color :  @page-color;
-            .box-shadow(@global-shadow);
-        }
-    }
-}
-
-.CodeMirror-dialog {
-  background-color: @page-color;
-}
diff --git a/notebook/static/edit/less/menubar.less b/notebook/static/edit/less/menubar.less
deleted file mode 100644
index c314f310d..000000000
--- a/notebook/static/edit/less/menubar.less
+++ /dev/null
@@ -1,26 +0,0 @@
-.selected-keymap {
-  i.fa {
-    padding: 0px 5px;
-  }
-  i.fa:before {
-    content: @fa-var-check;
-  }
-}
-
-#mode-menu {
-  // truncate mode-menu, so it doesn't get longer than the screen
-  overflow: auto;
-  max-height: 20em;
-}
-
-.edit_app {
-  #header {
-    .box-shadow(@global-shadow);
-  }
-
-  #menubar .navbar {
-    /* Use a negative 1 bottom margin, so the border overlaps the border of the
-    header */
-    margin-bottom: -1px;
-  }
-}
diff --git a/notebook/static/edit/less/style.less b/notebook/static/edit/less/style.less
deleted file mode 100644
index b365b9343..000000000
--- a/notebook/static/edit/less/style.less
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
-*
-* IPython text editor webapp
-*
-*/
-@import "menubar.less";
-@import "edit.less";
diff --git a/notebook/static/favicon.ico b/notebook/static/favicon.ico
deleted file mode 100644
index 2d1bcff7c..000000000
Binary files a/notebook/static/favicon.ico and /dev/null differ
diff --git a/notebook/static/notebook/css/override.css b/notebook/static/notebook/css/override.css
deleted file mode 100644
index 117fb7cf5..000000000
--- a/notebook/static/notebook/css/override.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*This file contains any manual css for this page that needs to override the global styles.
-This is only required when different pages style the same element differently. This is just
-a hack to deal with our current css styles and no new styling should be added in this file.*/
-
-#ipython-main-app {
-    position: relative;
-}
diff --git a/notebook/static/notebook/js/about.js b/notebook/static/notebook/js/about.js
deleted file mode 100644
index 628a9f7e1..000000000
--- a/notebook/static/notebook/js/about.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-requirejs([
-    'jquery',
-    'base/js/dialog',
-    'base/js/i18n',
-    'underscore',
-    'base/js/namespace'
-], function ($, dialog, i18n, _, IPython) {
-    'use strict';
-    $('#notebook_about').click(function () {
-        // use underscore template to auto html escape
-        if (sys_info) {
-          var text = i18n.msg._('You are using Jupyter notebook.');
-          text = text + '<br/><br/>';
-          text = text + i18n.msg._('The version of the notebook server is: ');
-          text = text + _.template('<b><%- version %></b>')({ version: sys_info.notebook_version });
-          if (sys_info.commit_hash) {
-              text = text + _.template('-<%- hash %>')({ hash: sys_info.commit_hash });
-          }
-         text = text + '<br/>';
-         text = text + i18n.msg._('The server is running on this version of Python:');
-          text = text + _.template('<br/><pre>Python <%- pyver %></pre>')({ 
-            pyver: sys_info.sys_version });
-          var kinfo = $('<div/>').attr('id', '#about-kinfo').text(i18n.msg._('Waiting for kernel to be available...'));
-          var body = $('<div/>');
-          body.append($('<h4/>').text(i18n.msg._('Server Information:')));
-          body.append($('<p/>').html(text));
-          body.append($('<h4/>').text(i18n.msg._('Current Kernel Information:')));
-          body.append(kinfo);
-        } else {
-          var text = i18n.msg._('Could not access sys_info variable for version information.');
-          var body = $('<div/>');
-          body.append($('<h4/>').text(i18n.msg._('Cannot find sys_info!')));
-          body.append($('<p/>').html(text));
-        }
-        dialog.modal({
-            title: i18n.msg._('About Jupyter Notebook'),
-            body: body,
-            buttons: { 'OK': {} }
-        });
-        try {
-            IPython.notebook.session.kernel.kernel_info(function (data) {
-                kinfo.html($('<pre/>').text(data.content.banner));
-            });
-        } catch (e) {
-            kinfo.html($('<p/>').text(i18n.msg._('unable to contact kernel')));
-        }
-    });
-});
diff --git a/notebook/static/notebook/js/actions.js b/notebook/static/notebook/js/actions.js
deleted file mode 100644
index 825b8642d..000000000
--- a/notebook/static/notebook/js/actions.js
+++ /dev/null
@@ -1,1028 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-// How to pick action names:
-//
-// * First pick a noun and a verb for the action. For example, if the action is "restart kernel," the verb is
-//   "restart" and the noun is "kernel".
-// * Omit terms like "selected" and "active" by default, so "delete-cell", rather than "delete-selected-cell".
-//   Only provide a scope like "-all-" if it is other than the default "selected" or "active" scope.
-// * If an action has a secondary action, separate the secondary action with "-and-", so
-//   "restart-kernel-and-clear-output".
-// * Don't ever use before/after as they have a temporal connotation that is confusing when used in a spatial
-//   context.
-// * Use above/below or previous/next to indicate spacial and sequential relationships.
-// * For dialogs, use a verb that indicates what the dialog will accomplish, such as "confirm-restart-kernel".
-
-
-define([
-    'base/js/i18n',
-    ], function(i18n){
-    "use strict";
-
-    var warn_bad_name = function(name){
-        if(name !== "" && !name.match(/:/)){
-            console.warn('You are trying to use an action/command name, where the separator between prefix and name is not `:`\n'+
-                         '"'+name+'"\n'+
-                         'You are likely to not use the API in a correct way. Typically use the following:\n'+
-                         '`var key = actions.register(<object>, "<name>", "<prefix>");` and reuse the `key` variable'+
-                         'instead of re-generating the key yourself.'
-                    );
-        }
-    };
-
-    var ActionHandler = function (env) {
-        this.env = env || {};
-        Object.seal(this);
-    };
-
-    var $ = requirejs('jquery');
-    var events =  requirejs('base/js/events');
-
-    /**
-     *  A bunch of predefined `Simple Actions` used by Jupyter.
-     *  `Simple Actions` have the following keys:
-     *  help (optional): a short string the describe the action.
-     *      will be used in various context, like as menu name, tool tips on buttons,
-     *      and short description in help menu.
-     *  help_index (optional): a string used to sort action in help menu.
-     *  icon (optional): a short string that represent the icon that have to be used with this
-     *  action. this should mainly correspond to a Font_awesome class.
-     *  handler : a function which is called when the action is activated. It will receive at first parameter
-     *      a dictionary containing various handle to element of the notebook.
-     *
-     *  action need to be registered with a **name** that can be use to refer to this action.
-     *
-     *  if `help` is not provided it will be derived by replacing any dash by space
-     *  in the **name** of the action. It is advised to provide a prefix to action name to
-     *  avoid conflict the prefix should be all lowercase and end with a dot `.`
-     *  in the absence of a prefix the behavior of the action is undefined.
-     *
-     *  All action provided by the Jupyter notebook are prefixed with `jupyter-notebook:`.
-     *
-     *  One can register extra actions or replace an existing action with another one is possible
-     *  but is considered undefined behavior.
-     *
-     **/
-    var _actions = {
-        'toggle-cell-rtl-layout': {
-            cmd: i18n.msg._('toggle current cell ltr/rtl direction'),
-            help: i18n.msg._('Toggle current cell directionality between left-to-right and right-to-left'),
-            handler: function (env) {
-              var notebook_direction = document.body.getAttribute('dir') == 'rtl' ? 'rtl' : 'ltr';
-              var current_cell_default_direction = env.notebook.get_selected_cell().cell_type == 'code' ? 'ltr' : notebook_direction;
-              var current_cell_direction = env.notebook.get_selected_cell().metadata.direction || current_cell_default_direction;
-              var new_direction = current_cell_direction == 'rtl' ? 'ltr' : 'rtl';
-              env.notebook.get_selected_cells().forEach(
-                  function(cell) { cell.metadata.direction = new_direction; }
-              );
-              env.notebook.set_dirty(true);
-              env.notebook.apply_directionality();
-            }
-        },
-        'toggle-rtl-layout': {
-            cmd: i18n.msg._('toggle notebook ltr/rtl direction'),
-            help: i18n.msg._('Toggle notebook directionality between left-to-right and right-to-left'),
-            handler: function (env) {
-              var new_direction = document.body.getAttribute('dir') == 'rtl' ? 'ltr' : 'rtl';
-              env.notebook.metadata.direction = new_direction;
-              env.notebook.set_dirty(true);
-              env.notebook.apply_directionality();
-            }
-        },
-        'edit-command-mode-keyboard-shortcuts': {
-            cmd: i18n.msg._('edit command mode keyboard shortcuts'),
-            help: i18n.msg._('Open a dialog to edit the command mode keyboard shortcuts'),
-            handler: function (env) {
-                env.notebook.show_shortcuts_editor();
-            }
-        },
-        'shutdown-kernel': {
-            help: 'Shutdown the kernel (no confirmation dialog)',
-            handler: function (env) {
-                env.notebook.shutdown_kernel({confirm: false});
-            }
-        },
-        'confirm-shutdown-kernel':{
-            icon: 'fa-repeat',
-            help_index : 'hb',
-            help: 'Shutdown the kernel (with confirmation dialog)',
-            handler : function (env) {
-                env.notebook.shutdown_kernel();
-            }
-        },
-        'restart-kernel': {
-            cmd: i18n.msg._('restart kernel'),
-            help: i18n.msg._('restart the kernel (no confirmation dialog)'),
-            handler: function (env) {
-                env.notebook.restart_kernel({confirm: false});
-            },
-        },
-        'confirm-restart-kernel':{
-            icon: 'fa-repeat',
-            help_index : 'hb',
-            cmd: i18n.msg._('confirm restart kernel'),
-            help: i18n.msg._('restart the kernel (with dialog)'),
-            handler : function (env) {
-                env.notebook.restart_kernel();
-            }
-        },
-        'restart-kernel-and-run-all-cells': {
-            cmd: i18n.msg._('restart kernel and run all cells'),
-            help: i18n.msg._('restart the kernel, then re-run the whole notebook (no confirmation dialog)'),
-            handler: function (env) {
-                env.notebook.restart_run_all({confirm: false});
-            }
-        },
-        'confirm-restart-kernel-and-run-all-cells': {
-            icon: 'fa-forward',
-            cmd: i18n.msg._('confirm restart kernel and run all cells'),
-            help: i18n.msg._('restart the kernel, then re-run the whole notebook (with dialog)'),
-            handler: function (env) {
-                env.notebook.restart_run_all();
-            }
-        },
-        'restart-kernel-and-clear-output': {
-            cmd: i18n.msg._('restart kernel and clear output'),
-            help: i18n.msg._('restart the kernel and clear all output (no confirmation dialog)'),
-            handler: function (env) {
-                env.notebook.restart_clear_output({confirm: false});
-            }
-        },
-        'confirm-restart-kernel-and-clear-output': {
-            cmd: i18n.msg._('confirm restart kernel and clear output'),
-            help: i18n.msg._('restart the kernel and clear all output (with dialog)'),
-            handler: function (env) {
-                env.notebook.restart_clear_output();
-            }
-        },
-        'interrupt-kernel':{
-            icon: 'fa-stop',
-            cmd: i18n.msg._('interrupt the kernel'),
-            help: i18n.msg._('interrupt the kernel'),
-            help_index : 'ha',
-            handler : function (env) {
-                env.notebook.kernel.interrupt();
-            }
-        },
-        'run-cell-and-select-next': {
-            cmd: i18n.msg._('run cell and select next'),
-            icon: 'fa-play',
-            help: i18n.msg._('run cell, select below'),
-            help_index : 'ba',
-            handler : function (env) {
-                env.notebook.execute_cell_and_select_below();
-            }
-        },
-        'run-cell':{
-            cmd: i18n.msg._('run selected cells'),
-            help    : i18n.msg._('run selected cells'),
-            help_index : 'bb',
-            handler : function (env) {
-                env.notebook.execute_selected_cells();
-            }
-        },
-        'run-cell-and-insert-below':{
-            cmd: i18n.msg._('run cell and insert below'),
-            help    : i18n.msg._('run cell and insert below'),
-            help_index : 'bc',
-            handler : function (env) {
-                env.notebook.execute_cell_and_insert_below();
-            }
-        },
-        'run-all-cells': {
-            cmd: i18n.msg._('run all cells'),
-            help: i18n.msg._('run all cells'),
-            help_index: 'bd',
-            handler: function (env) {
-                env.notebook.execute_all_cells();
-            }
-        },
-        'run-all-cells-above':{
-            cmd: i18n.msg._('run all cells above'),
-            help: i18n.msg._('run all cells above'),
-            handler : function (env) {
-                env.notebook.execute_cells_above();
-            }
-        },
-        'run-all-cells-below':{
-            cmd: i18n.msg._('run all cells below'),
-            help: i18n.msg._('run all cells below'),
-            handler : function (env) {
-                env.notebook.execute_cells_below();
-            }
-        },
-        'enter-command-mode': {
-            cmd: i18n.msg._('enter command mode'),
-            help    : i18n.msg._('enter command mode'),
-            help_index : 'aa',
-            handler : function (env) {
-                env.notebook.command_mode();
-            }
-        },
-        'insert-image': {
-            cmd: i18n.msg._('insert image'),
-            help      : i18n.msg._('insert image'),
-            help_index : 'dz',
-            handler : function (env) {
-                env.notebook.insert_image();
-            }
-        },
-        'cut-cell-attachments': {
-            cmd: i18n.msg._('cut cell attachments'),
-            help    : i18n.msg._('cut cell attachments'),
-            help_index : 'dza',
-            handler: function (env) {
-                env.notebook.cut_cell_attachments();
-            }
-        },
-        'copy-cell-attachments': {
-            cmd: i18n.msg._('copy cell attachments'),
-            help    : i18n.msg._('copy cell attachments'),
-            help_index: 'dzb',
-            handler: function (env) {
-                env.notebook.copy_cell_attachments();
-            }
-        },
-        'paste-cell-attachments': {
-            cmd: i18n.msg._('paste cell attachments'),
-            help    : i18n.msg._('paste cell attachments'),
-            help_index: 'dzc',
-            handler: function (env) {
-                env.notebook.paste_cell_attachments();
-            }
-        },
-        'split-cell-at-cursor': {
-            cmd: i18n.msg._('split cell at cursor(s)'),
-            help    : i18n.msg._('split cell at cursor(s)'),
-            help_index : 'ea',
-            handler : function (env) {
-                env.notebook.split_cell();
-            }
-        },
-        'enter-edit-mode' : {
-            cmd: i18n.msg._('enter edit mode'),
-            help : i18n.msg._('enter edit mode'),
-            help_index : 'aa',
-            handler : function (env) {
-                env.notebook.edit_mode();
-            }
-        },
-        'select-previous-cell' : {
-            cmd: i18n.msg._('select previous cell'),
-            help: i18n.msg._('select cell above'),
-            help_index : 'da',
-            handler : function (env) {
-                var index = env.notebook.get_selected_index();
-                if (index !== 0 && index !== null) {
-                    env.notebook.select_prev(true);
-                    env.notebook.focus_cell();
-                }
-            }
-        },
-        'select-next-cell' : {
-            cmd: i18n.msg._('select next cell'),
-            help: i18n.msg._('select cell below'),
-            help_index : 'db',
-            handler : function (env) {
-                var index = env.notebook.get_selected_index();
-                if (index !== (env.notebook.ncells()-1) && index !== null) {
-                    env.notebook.select_next(true);
-                    env.notebook.focus_cell();
-                }
-            }
-        },
-        'extend-selection-above' : {
-            cmd: i18n.msg._('extend selection above'),
-            help: i18n.msg._('extend selected cells above'),
-            help_index : 'dc',
-            handler : function (env) {
-                env.notebook.extend_selection_by(-1);
-                // scroll into view,
-                // do not call notebook.focus_cell(), or
-                // all the selection get thrown away
-                env.notebook.get_selected_cell().element.focus();
-            }
-        },
-        'extend-selection-below' : {
-            cmd: i18n.msg._('extend selection below'),
-            help: i18n.msg._('extend selected cells below'),
-            help_index : 'dd',
-            handler : function (env) {
-                env.notebook.extend_selection_by(1);
-                // scroll into view,
-                // do not call notebook.focus_cell(), or
-                // all the selection get thrown away
-                env.notebook.get_selected_cell().element.focus();
-            }
-        },
-        'select-all' : {
-            cmd: i18n.msg._('select all'),
-            help: i18n.msg._('select all cells'),
-            help_index : 'de',
-            handler : function (env) {
-                env.notebook.select_all();
-                env.notebook.get_selected_cell().element.focus();
-            }
-        },
-        'cut-cell' : {
-            cmd: i18n.msg._('cut selected cells'),
-            help: i18n.msg._('cut selected cells'),
-            icon: 'fa-cut',
-            help_index : 'ee',
-            handler : function (env) {
-                var index = env.notebook.get_selected_index();
-                env.notebook.cut_cell();
-                env.notebook.select(index);
-            }
-        },
-        'copy-cell' : {
-            cmd: i18n.msg._('copy selected cells'),
-            help: i18n.msg._('copy selected cells'),
-            icon: 'fa-copy',
-            help_index : 'ef',
-            handler : function (env) {
-                env.notebook.copy_cell();
-            }
-        },
-        'paste-cell-replace' : {
-            help: 'paste cells replace',
-            handler : function (env) {
-                env.notebook.paste_cell_replace();
-            }
-        },
-        'paste-cell-above' : {
-            cmd: i18n.msg._('paste cells above'),
-            help: i18n.msg._('paste cells above'),
-            help_index : 'eg',
-            handler : function (env) {
-                env.notebook.paste_cell_above();
-            }
-        },
-        'paste-cell-below' : {
-            cmd: i18n.msg._('paste cells below'),
-            help: i18n.msg._('paste cells below'),
-            icon: 'fa-paste',
-            help_index : 'eh',
-            handler : function (env) {
-                env.notebook.paste_cell_below();
-            }
-        },
-        'insert-cell-above' : {
-            cmd: i18n.msg._('insert cell above'),
-            help: i18n.msg._('insert cell above'),
-            help_index : 'ec',
-            handler : function (env) {
-                env.notebook.insert_cell_above();
-                env.notebook.select_prev(true);
-                env.notebook.focus_cell();
-            }
-        },
-        'insert-cell-below' : {
-            cmd: i18n.msg._('insert cell below'),
-            help: i18n.msg._('insert cell below'),
-            icon : 'fa-plus',
-            help_index : 'ed',
-            handler : function (env) {
-                env.notebook.insert_cell_below();
-                env.notebook.select_next(true);
-                env.notebook.focus_cell();
-            }
-        },
-        'change-cell-to-code' : {
-            cmd: i18n.msg._('change cell to code'),
-            help    : i18n.msg._('change cell to code'),
-            help_index : 'ca',
-            handler : function (env) {
-                env.notebook.cells_to_code();
-            }
-        },
-        'change-cell-to-markdown' : {
-            cmd: i18n.msg._('change cell to markdown'),
-            help    : i18n.msg._('change cell to markdown'),
-            help_index : 'cb',
-            handler : function (env) {
-                env.notebook.cells_to_markdown();
-            }
-        },
-        'change-cell-to-raw' : {
-            cmd: i18n.msg._('change cell to raw'),
-            help    : i18n.msg._('change cell to raw'),
-            help_index : 'cc',
-            handler : function (env) {
-                env.notebook.cells_to_raw();
-            }
-        },
-        'change-cell-to-heading-1' : {
-            cmd: i18n.msg._('change cell to heading 1'),
-            help    : i18n.msg._('change cell to heading 1'),
-            help_index : 'cd',
-            handler : function (env) {
-                env.notebook.to_heading(undefined, 1);
-            }
-        },
-        'change-cell-to-heading-2' : {
-            cmd: i18n.msg._('change cell to heading 2'),
-            help    : i18n.msg._('change cell to heading 2'),
-            help_index : 'ce',
-            handler : function (env) {
-                env.notebook.to_heading(undefined, 2);
-            }
-        },
-        'change-cell-to-heading-3' : {
-            cmd: i18n.msg._('change cell to heading 3'),
-            help    : i18n.msg._('change cell to heading 3'),
-            help_index : 'cf',
-            handler : function (env) {
-                env.notebook.to_heading(undefined, 3);
-            }
-        },
-        'change-cell-to-heading-4' : {
-            cmd: i18n.msg._('change cell to heading 4'),
-            help    : i18n.msg._('change cell to heading 4'),
-            help_index : 'cg',
-            handler : function (env) {
-                env.notebook.to_heading(undefined, 4);
-            }
-        },
-        'change-cell-to-heading-5' : {
-            cmd: i18n.msg._('change cell to heading 5'),
-            help    : i18n.msg._('change cell to heading 5'),
-            help_index : 'ch',
-            handler : function (env) {
-                env.notebook.to_heading(undefined, 5);
-            }
-        },
-        'change-cell-to-heading-6' : {
-            cmd: i18n.msg._('change cell to heading 6'),
-            help    : i18n.msg._('change cell to heading 6'),
-            help_index : 'ci',
-            handler : function (env) {
-                env.notebook.to_heading(undefined, 6);
-            }
-        },
-        'toggle-cell-output-collapsed' : {
-            cmd: i18n.msg._('toggle cell output'),
-            help    : i18n.msg._('toggle output of selected cells'),
-            help_index : 'gb',
-            handler : function (env) {
-                env.notebook.toggle_cells_outputs();
-            }
-        },
-        'toggle-cell-output-scrolled' : {
-            cmd: i18n.msg._('toggle cell scrolling'),
-            help    : i18n.msg._('toggle output scrolling of selected cells'),
-            help_index : 'gc',
-            handler : function (env) {
-                env.notebook.toggle_cells_outputs_scroll();
-            }
-        },
-        'clear-cell-output' : {
-            cmd: i18n.msg._('clear cell output'),
-            help    : i18n.msg._('clear output of selected cells'),
-            handler : function (env) {
-                env.notebook.clear_cells_outputs();
-            }
-        },
-        'move-cell-down' : {
-            cmd: i18n.msg._('move cells down'),
-            help: i18n.msg._('move selected cells down'),
-            icon: 'fa-arrow-down',
-            help_index : 'eb',
-            handler : function (env) {
-                env.notebook.move_cell_down();
-            }
-        },
-        'move-cell-up' : {
-            cmd: i18n.msg._('move cells up'),
-            help: i18n.msg._('move selected cells up'),
-            icon: 'fa-arrow-up',
-            help_index : 'ea',
-            handler : function (env) {
-                env.notebook.move_cell_up();
-            }
-        },
-        'toggle-cell-line-numbers' : {
-            cmd: i18n.msg._('toggle line numbers'),
-            help    : i18n.msg._('toggle line numbers'),
-            help_index : 'ga',
-            handler : function (env) {
-                env.notebook.cell_toggle_line_numbers();
-            }
-        },
-        'show-keyboard-shortcuts' : {
-            cmd: i18n.msg._('show keyboard shortcuts'),
-            help    : i18n.msg._('show keyboard shortcuts'),
-            help_index : 'ge',
-            handler : function (env) {
-                env.quick_help.show_keyboard_shortcuts();
-            }
-        },
-        'delete-cell': {
-            cmd: i18n.msg._('delete cells'),
-            help: i18n.msg._('delete selected cells'),
-            help_index : 'ej',
-            handler : function (env) {
-                env.notebook.delete_cell();
-            }
-        },
-        'undo-cell-deletion' : {
-            cmd: i18n.msg._('undo cell deletion'),
-            help: i18n.msg._('undo cell deletion'),
-            help_index : 'ei',
-            handler : function (env) {
-                env.notebook.undelete_cell();
-            }
-        },
-        // TODO reminder
-        // open an issue, merge with above merge with last cell of notebook if at top.
-        'merge-cell-with-previous-cell' : {
-            cmd: i18n.msg._('merge cell with previous cell'),
-            help    : i18n.msg._('merge cell above'),
-            handler : function (env) {
-                env.notebook.merge_cell_above();
-            }
-        },
-        'merge-cell-with-next-cell' : {
-            cmd: i18n.msg._('merge cell with next cell'),
-            help    : i18n.msg._('merge cell below'),
-            help_index : 'ek',
-            handler : function (env) {
-                env.notebook.merge_cell_below();
-            }
-        },
-        'merge-selected-cells' : {
-            cmd: i18n.msg._('merge selected cells'),
-            help : i18n.msg._('merge selected cells'),
-            help_index: 'el',
-            handler: function(env) {
-                env.notebook.merge_selected_cells();
-            }
-        },
-        'merge-cells' : {
-            cmd: i18n.msg._('merge cells'),
-            help : i18n.msg._('merge selected cells, or current cell with cell below if only one cell is selected'),
-            help_index: 'el',
-            handler: function(env) {
-                var l = env.notebook.get_selected_cells_indices().length;
-                if(l == 1){
-                    env.notebook.merge_cell_below();
-                } else {
-                    env.notebook.merge_selected_cells();
-                }
-            }
-        },
-        'show-command-palette': {
-            help_index : 'aa',
-            cmd: i18n.msg._('show command pallette'),
-            help: i18n.msg._('open the command palette'),
-            icon: 'fa-keyboard-o',
-            handler : function(env){
-                env.notebook.show_command_palette();
-            }
-        },
-        'toggle-all-line-numbers': {
-            cmd: i18n.msg._('toggle all line numbers'),
-            help : i18n.msg._('toggles line numbers in all cells, and persist the setting'),
-            icon: 'fa-list-ol',
-            handler: function(env) {
-                var value = !env.notebook.line_numbers;
-                env.notebook.get_cells().map(function(c) {
-                    c.code_mirror.setOption('lineNumbers', value);
-                });
-                env.notebook.line_numbers = value;
-            }
-        },
-        'show-all-line-numbers': {
-            cmd: i18n.msg._('show all line numbers'),
-            help : i18n.msg._('show line numbers in all cells, and persist the setting'),
-            handler: function(env) {
-                env.notebook.get_cells().map(function(c) {
-                    c.code_mirror.setOption('lineNumbers', true);
-                });
-                env.notebook.line_numbers = true;
-            }
-        },
-        'hide-all-line-numbers': {
-            cmd: i18n.msg._('hide all line numbers'),
-            help : i18n.msg._('hide line numbers in all cells, and persist the setting'),
-            handler: function(env) {
-                env.notebook.get_cells().map(function(c) {
-                    c.code_mirror.setOption('lineNumbers', false);
-                });
-                env.notebook.line_numbers = false;
-            }
-        },
-        'toggle-header':{
-            cmd: i18n.msg._('toggle header'),
-            help: i18n.msg._('switch between showing and hiding the header'),
-            handler : function(env) {
-                var value = !env.notebook.header;
-                if (value === true) {
-                    $('#header-container').show();
-                    $('.header-bar').show();
-                } else if (value === false) {
-                    $('#header-container').hide();
-                    $('.header-bar').hide();
-                }
-                events.trigger('resize-header.Page');
-                env.notebook.header = value;
-            }
-        },
-        'show-header':{
-            cmd: i18n.msg._('show the header'),
-            help: i18n.msg._('show the header'),
-            handler : function(env) {
-                $('#header-container').show();
-                $('.header-bar').show();
-                events.trigger('resize-header.Page');
-                env.notebook.header = true;
-            }
-        },
-        'hide-header':{
-            cmd: i18n.msg._('hide the header'),
-            help: i18n.msg._('hide the header'),
-            handler : function(env) {
-                $('#header-container').hide();
-                $('.header-bar').hide();
-                events.trigger('resize-header.Page');
-                env.notebook.header = false;
-            }
-        },
-        'toggle-menubar':{
-            help: 'hide/show the menu bar',
-            handler : function(env) {
-                $('#menubar-container').toggle();
-                events.trigger('resize-header.Page');
-            }
-        },
-        'show-menubar':{
-            help: 'show the menu bar',
-            handler : function(env) {
-                $('#menubar-container').show();
-                events.trigger('resize-header.Page');
-            }
-        },
-        'hide-menubar':{
-            help: 'hide the menu bar',
-            handler : function(env) {
-                $('#menubar-container').hide();
-                events.trigger('resize-header.Page');
-            }
-        },
-        'toggle-toolbar':{
-            cmd: i18n.msg._('toggle toolbar'),
-            help: i18n.msg._('switch between showing and hiding the toolbar'),
-            handler : function(env) {
-                var value = !env.notebook.toolbar;
-                if (value === true) {
-                    $('div#maintoolbar').show();
-                } else if (value === false) {
-                    $('div#maintoolbar').hide();
-                }
-                events.trigger('resize-header.Page');
-                env.notebook.toolbar = value;
-            }
-        },
-        'show-toolbar':{
-            cmd: i18n.msg._('show the toolbar'),
-            help: i18n.msg._('show the toolbar'),
-            handler : function(env) {
-                $('div#maintoolbar').show();
-                events.trigger('resize-header.Page');
-                env.notebook.toolbar = true;
-            }
-        },
-        'hide-toolbar':{
-            cmd: i18n.msg._('hide the toolbar'),
-            help: i18n.msg._('hide the toolbar'),
-            handler : function(env) {
-                $('div#maintoolbar').hide();
-                events.trigger('resize-header.Page');
-                env.notebook.toolbar = false;
-            }
-        },
-        'close-pager': {
-            cmd: i18n.msg._('close the pager'),
-            help : i18n.msg._('close the pager'),
-            handler : function(env) {
-                // Collapse the page if it is open
-                if (env.pager && env.pager.expanded) {
-                    env.pager.collapse();
-                }
-            }
-        },
-        'auto-indent': {
-            cmd: i18n.msg._('automatically indent selection'),
-            help : i18n.msg._('automatically indent selection'),
-            handler : function(env) {
-              // Get selected cell
-              var selected_cell = env.notebook.get_selected_cell();
-              // Execute a CM command
-              selected_cell.code_mirror.execCommand('indentAuto');
-            }
-        },
-        'close-and-halt': {
-            cmd: i18n.msg._('shutdown kernel and close window'),
-            help : i18n.msg._('shutdown kernel and close window'),
-            handler : function(env) {
-                env.notebook.close_and_halt();
-            }
-        }
-    };
-
-    /**
-     * A bunch of `Advance actions` for Jupyter.
-     * Cf `Simple Action` plus the following properties.
-     *
-     * handler: first argument of the handler is the event that triggered the action
-     *      (typically keypress). The handler is responsible for any modification of the
-     *      event and event propagation.
-     *      Is also responsible for returning false if the event have to be further ignored,
-     *      true, to tell keyboard manager that it ignored the event.
-     *
-     *      the second parameter of the handler is the environment passed to Simple Actions
-     *
-     **/
-    var custom_ignore = {
-        'ignore':{
-            cmd: i18n.msg._('ignore'),
-            handler : function () {
-                return true;
-            }
-        },
-        'move-cursor-up':{
-            cmd: i18n.msg._('move cursor up'),
-            help: i18n.msg._("move cursor up"),
-            handler : function (env, event) {
-                var index = env.notebook.get_selected_index();
-                var cell = env.notebook.get_cell(index);
-                var cm = env.notebook.get_selected_cell().code_mirror;
-                var cur = cm.getCursor();
-                if (cell && cell.at_top() && index !== 0 && cur.ch === 0) {
-                    if(event){
-                        event.preventDefault();
-                    }
-                    env.notebook.command_mode();
-                    env.notebook.select_prev(true);
-                    env.notebook.edit_mode();
-                    cm = env.notebook.get_selected_cell().code_mirror;
-                    cm.setCursor(cm.lastLine(), 0);
-                }
-                return false;
-            }
-        },
-        'move-cursor-down':{
-            cmd: i18n.msg._('move cursor down'),
-            help: i18n.msg._("move cursor down"),
-            handler : function (env, event) {
-                var index = env.notebook.get_selected_index();
-                var cell = env.notebook.get_cell(index);
-                if (cell.at_bottom() && index !== (env.notebook.ncells()-1)) {
-                    if(event){
-                        event.preventDefault();
-                    }
-                    env.notebook.command_mode();
-                    env.notebook.select_next(true);
-                    env.notebook.edit_mode();
-                    var cm = env.notebook.get_selected_cell().code_mirror;
-                    cm.setCursor(0, 0);
-                }
-                return false;
-            }
-        },
-        'scroll-notebook-down': {
-            cmd: i18n.msg._('scroll notebook down'),
-            help: i18n.msg._("scroll notebook down"),
-            handler: function(env, event) {
-                if(event){
-                    event.preventDefault();
-                }
-                return env.notebook.scroll_manager.scroll(1);
-            },
-        },
-        'scroll-notebook-up': {
-            cmd: i18n.msg._('scroll notebook up'),
-            help: i18n.msg._("scroll notebook up"),
-            handler: function(env, event) {
-                if(event){
-                    event.preventDefault();
-                }
-                return env.notebook.scroll_manager.scroll(-1);
-            },
-        },
-        'scroll-cell-center': {
-            cmd: i18n.msg._('scroll cell center'),
-            help: i18n.msg._("Scroll the current cell to the center"),
-            handler: function (env, event) {
-                if(event){
-                    event.preventDefault();
-                }
-                var cell = env.notebook.get_selected_index();
-                return env.notebook.scroll_cell_percent(cell, 50, 0);
-            }
-        },
-        'scroll-cell-top': {
-            cmd: i18n.msg._('scroll cell top'),
-            help: i18n.msg._("Scroll the current cell to the top"),
-            handler: function (env, event) {
-                if(event){
-                    event.preventDefault();
-                }
-                var cell = env.notebook.get_selected_index();
-                return env.notebook.scroll_cell_percent(cell, 0, 0);
-            }
-        },
-        'duplicate-notebook':{
-            cmd: i18n.msg._('duplicate notebook'),
-            help: i18n.msg._("Create and open a copy of the current notebook"),
-            handler : function (env, event) {
-                env.notebook.copy_notebook();
-            }
-        },
-        'trust-notebook':{
-            cmd: i18n.msg._('trust notebook'),
-            help: i18n.msg._("Trust the current notebook"),
-            handler : function (env, event) {
-                env.notebook.trust_notebook();
-            }
-        },
-        'rename-notebook':{
-            cmd: i18n.msg._('rename notebook'),
-            help: i18n.msg._("Rename the current notebook"),
-            handler : function (env, event) {
-                env.notebook.save_widget.rename_notebook({notebook: env.notebook});
-            }
-        },
-        'toggle-all-cells-output-collapsed':{
-            cmd: i18n.msg._('toggle all cells output collapsed'),
-            help: i18n.msg._("Toggle the hidden state of all output areas"),
-            handler : function (env, event) {
-                env.notebook.toggle_all_output();
-            }
-        },
-        'toggle-all-cells-output-scrolled':{
-            cmd: i18n.msg._('toggle all cells output scrolled'),
-            help: i18n.msg._("Toggle the scrolling state of all output areas"),
-            handler : function (env, event) {
-                env.notebook.toggle_all_output_scroll();
-            }
-        },
-
-        'clear-all-cells-output':{
-            cmd: i18n.msg._('clear all cells output'),
-            help: i18n.msg._("Clear the content of all the outputs"),
-            handler : function (env, event) {
-                env.notebook.clear_all_output();
-            }
-        },
-        'save-notebook':{
-            cmd: i18n.msg._('save notebook'),
-            help: i18n.msg._("Save and Checkpoint"),
-            help_index : 'fb',
-            icon: 'fa-save',
-            handler : function (env, event) {
-                env.notebook.save_checkpoint();
-                if(event){
-                    event.preventDefault();
-                }
-                return false;
-            }
-        },
-    };
-
-    // private stuff that prepend `jupyter-notebook:` to actions names
-    // and uniformize/fill in missing pieces in of an action.
-    var _prepare_handler = function(registry, subkey, source){
-        registry['jupyter-notebook:'+subkey] = {};
-        registry['jupyter-notebook:'+subkey].cmd = source[subkey].cmd;
-        registry['jupyter-notebook:'+subkey].help = source[subkey].help||subkey.replace(/-/g,' ');
-        registry['jupyter-notebook:'+subkey].help_index = source[subkey].help_index;
-        registry['jupyter-notebook:'+subkey].icon = source[subkey].icon;
-        return source[subkey].handler;
-    };
-
-    // Will actually generate/register all the Jupyter actions
-    var fun = function(){
-        var final_actions = {};
-        var k;
-        for(k in _actions){
-            if(_actions.hasOwnProperty(k)){
-                // Js closure are function level not block level need to wrap in a IIFE
-                // and append jupyter-notebook: to event name these things do intercept event so are wrapped
-                // in a function that return false.
-                var handler = _prepare_handler(final_actions, k, _actions);
-                (function(key, handler){
-                    final_actions['jupyter-notebook:'+key].handler = function(env, event){
-                        handler(env);
-                        if(event){
-                            event.preventDefault();
-                        }
-                        return false;
-                    };
-                })(k, handler);
-            }
-        }
-
-        for(k in custom_ignore){
-            // Js closure are function level not block level need to wrap in a IIFE
-            // same as above, but decide for themselves whether or not they intercept events.
-            if(custom_ignore.hasOwnProperty(k)){
-                handler = _prepare_handler(final_actions, k, custom_ignore);
-                (function(key, handler){
-                    final_actions['jupyter-notebook:'+key].handler = function(env, event){
-                        return handler(env, event);
-                    };
-                })(k, handler);
-            }
-        }
-
-        return final_actions;
-    };
-    ActionHandler.prototype._actions = fun();
-
-
-    /**
-     *  extend the environment variable that will be pass to handlers
-     **/
-    ActionHandler.prototype.extend_env = function(env){
-        for(var k in env){
-            this.env[k] = env[k];
-        }
-    };
-
-    ActionHandler.prototype.register = function(action, name, prefix){
-        /**
-         * Register an `action` with an optional name and prefix.
-         *
-         * if name and prefix are not given they will be determined automatically.
-         * if action if just a `function` it will be wrapped in an anonymous action.
-         *
-         * @return the full name to access this action .
-         **/
-        action = this.normalise(action);
-        if( !name ){
-            name = 'autogenerated-'+String(action.handler);
-        }
-        prefix = prefix || 'auto';
-        var full_name = prefix+':'+name;
-        this._actions[full_name] = action;
-        return full_name;
-
-    };
-
-
-    ActionHandler.prototype.normalise = function(data){
-        /**
-         * given an `action` or `function`, return a normalised `action`
-         * by setting all known attributes and removing unknown attributes;
-         **/
-        if(typeof(data) === 'function'){
-            data = {handler:data};
-        }
-        if(typeof(data.handler) !== 'function'){
-            throw new Error('unknown datatype, cannot register');
-        }
-        var _data = data;
-        data = {};
-        data.handler = _data.handler;
-        data.help = _data.help || '';
-        data.icon = _data.icon || '';
-        data.help_index = _data.help_index || '';
-        return data;
-    };
-
-    ActionHandler.prototype.get_name = function(name_or_data){
-        /**
-         * given an `action` or `name` of an action, return the name attached to this action.
-         * if given the name of and corresponding actions does not exist in registry, return `null`.
-         **/
-
-        if(typeof(name_or_data) === 'string'){
-            warn_bad_name(name_or_data);
-            if(this.exists(name_or_data)){
-                return name_or_data;
-            } else {
-                return null;
-            }
-        } else {
-            return this.register(name_or_data);
-        }
-    };
-
-    ActionHandler.prototype.get = function(name){
-        warn_bad_name(name);
-        return this._actions[name];
-    };
-
-    ActionHandler.prototype.call = function(name, event, env){
-        return this._actions[name].handler(env|| this.env, event);
-    };
-
-    ActionHandler.prototype.exists = function(name){
-        return (typeof(this._actions[name]) !== 'undefined');
-    };
-
-    return {init:ActionHandler};
-
-});
diff --git a/notebook/static/notebook/js/cell.js b/notebook/static/notebook/js/cell.js
deleted file mode 100644
index 4fd4ec442..000000000
--- a/notebook/static/notebook/js/cell.js
+++ /dev/null
@@ -1,878 +0,0 @@
-// Distributed under the terms of the Modified BSD License.
-
-/**
- *
- *
- * @module cell
- * @namespace cell
- * @class Cell
- */
-
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n',
-    'codemirror/lib/codemirror',
-    'codemirror/addon/edit/matchbrackets',
-    'codemirror/addon/edit/closebrackets',
-    'codemirror/addon/comment/comment',
-    'services/config',
-], function($, utils, i18n, CodeMirror, cm_match, cm_closeb, cm_comment, configmod) {
-    "use strict";
-
-    function is_single_cursor(dict1, dict2) {
-        return ((dict1.line == dict2.line) && (dict1.ch == dict2.ch));
-    };
-    
-    var overlayHack = CodeMirror.scrollbarModel.native.prototype.overlayHack;
-
-    CodeMirror.scrollbarModel.native.prototype.overlayHack = function () {
-        overlayHack.apply(this, arguments);
-        // Reverse `min-height: 18px` scrollbar hack on OS X
-        // which causes a dead area, making it impossible to click on the last line
-        // when there is horizontal scrolling to do and the "show scrollbar only when scrolling" behavior
-        // is enabled.
-        // This, in turn, has the undesirable behavior of never showing the horizontal scrollbar,
-        // even when it should, which is less problematic, at least.
-        if (/Mac/.test(navigator.platform)) {
-            this.horiz.style.minHeight = "";
-        }
-    };
-    
-    var Cell = function (options) {
-        /* Constructor
-         *
-         * The Base `Cell` class from which to inherit.
-         * @constructor
-         * @param:
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance
-         *          config: dictionary
-         *          keyboard_manager: KeyboardManager instance
-         */
-        options = options || {};
-        this.keyboard_manager = options.keyboard_manager;
-        this.events = options.events;
-        var config = options.config;
-        // superclass default overwrite our default
-        
-        this.selected = false;
-        this.anchor = false;
-        this.rendered = false;
-        this.mode = 'command';
-
-        // Metadata property
-        var that = this;
-        this._metadata = {};
-        Object.defineProperty(this, 'metadata', {
-            get: function() { return that._metadata; },
-            set: function(value) {
-                that._metadata = value;
-                if (that.celltoolbar) {
-                    that.celltoolbar.rebuild();
-                }
-            }
-        });
-
-
-        // backward compat.
-        Object.defineProperty(this, 'cm_config', {
-            get: function() {
-                console.warn(i18n.msg._("Warning: accessing Cell.cm_config directly is deprecated."));
-                return that._options.cm_config;
-            },
-        });
-
-        // load this from metadata later ?
-        this.user_highlight = 'auto';
-
-        // merge my class-specific config data with general cell-level config
-        var class_config_data = {};
-        if (this.class_config) {
-            class_config_data = this.class_config.get_sync();
-        }
-
-        var cell_config = new configmod.ConfigWithDefaults(options.config,
-            Cell.options_default, 'Cell');
-        var cell_config_data = cell_config.get_sync();
-
-        // this._options is a merge of SomeCell and Cell config data:
-        this._options = utils.mergeopt({}, cell_config_data, class_config_data);
-        this.placeholder = this._options.placeholder || '';
-
-        this.cell_id = utils.uuid();
-
-        // For JS VM engines optimization, attributes should be all set (even
-        // to null) in the constructor, and if possible, if different subclass
-        // have new attributes with same name, they should be created in the
-        // same order. Easiest is to create and set to null in parent class.
-
-        this.element = null;
-        this.cell_type = this.cell_type || null;
-        this.code_mirror = null;
-
-        // The nbformat only specifies attachments for textcell, but to avoid
-        // data loss when switching between cell types in the UI, all cells
-        // have an attachments property here. It is only saved to disk
-        // for textcell though (in toJSON)
-        this.attachments = {};
-
-        this.create_element();
-        if (this.element !== null) {
-            this.element.data("cell", this);
-            this.bind_events();
-            this.init_classes();
-        }
-    };
-
-    Cell.options_default = {
-        cm_config : {
-            indentUnit : 4,
-            readOnly: false,
-            theme: "default",
-            extraKeys: {
-                "Cmd-Right": "goLineRight",
-                "End": "goLineRight",
-                "Cmd-Left": "goLineLeft",
-                "Tab": "indentMore",
-                "Shift-Tab" : "indentLess",
-                "Cmd-/" : "toggleComment",
-                "Ctrl-/" : "toggleComment",
-            }
-        }
-    };
-    
-    // FIXME: Workaround CM Bug #332 (Safari segfault on drag)
-    // by disabling drag/drop altogether on Safari
-    // https://github.com/codemirror/CodeMirror/issues/332    
-    if (utils.browser[0] == "Safari") {
-        Cell.options_default.cm_config.dragDrop = false;
-    }
-
-    /**
-     * Empty. Subclasses must implement create_element.
-     * This should contain all the code to create the DOM element in notebook
-     * and will be called by Base Class constructor.
-     * @method create_element
-     */
-    Cell.prototype.create_element = function () {
-    };
-
-    Cell.prototype.init_classes = function () {
-        /**
-         * Call after this.element exists to initialize the css classes
-         * related to selected, rendered and mode.
-         */
-        if (this.selected) {
-            this.element.addClass('selected');
-        } else {
-            this.element.addClass('unselected');
-        }
-        if (this.rendered) {
-            this.element.addClass('rendered');
-        } else {
-            this.element.addClass('unrendered');
-        }
-    };
-
-    /**
-     * trigger on focus and on click to bubble up to the notebook and
-     * potentially extend the selection if shift-click, contract the selection
-     * if just codemirror focus (so edit mode).
-     * We **might** be able to move that to notebook `handle_edit_mode`.
-     */
-    Cell.prototype._on_click = function (event) {
-        if (!this.selected) {
-            this.events.trigger('select.Cell', {'cell':this, 'extendSelection':event.shiftKey});
-        } else {
-            // I'm already part of the selection; contract selection to just me
-            this.events.trigger('select.Cell', {'cell': this});
-        }
-    };
-
-    /**
-     * Subclasses can implement override bind_events.
-     * Be careful to call the parent method when overwriting as it fires event.
-     * this will be triggered after create_element in constructor.
-     * @method bind_events
-     */
-    Cell.prototype.bind_events = function () {
-        var that = this;
-        // We trigger events so that Cell doesn't have to depend on Notebook.
-        that.element.click(function (event) {
-            that._on_click(event);
-        });
-        if (this.code_mirror) {
-            this.code_mirror.on("change", function(cm, change) {
-                that.events.trigger("change.Cell", {cell: that, change: change});
-                that.events.trigger("set_dirty.Notebook", {value: true});
-            });
-        }
-        if (this.code_mirror) {
-            this.code_mirror.on('focus', function(cm, change) {
-                if (!that.selected) {
-                    that.events.trigger('select.Cell', {'cell':that});
-                }
-                that.events.trigger('edit_mode.Cell', {cell: that});
-            });
-        }
-        if (this.code_mirror) {
-            this.code_mirror.on('blur', function(cm, change) {
-                that.events.trigger('command_mode.Cell', {cell: that});
-            });
-        }
-
-        this.element.dblclick(function () {
-            if (that.selected === false) {
-                this.events.trigger('select.Cell', {'cell':that});
-            }
-        });
-    };
-    
-    /**
-     * This method gets called in CodeMirror's onKeyDown/onKeyPress
-     * handlers and is used to provide custom key handling.
-     *
-     * To have custom handling, subclasses should override this method, but still call it
-     * in order to process the Edit mode keyboard shortcuts.
-     *
-     * @method handle_codemirror_keyevent
-     * @param {CodeMirror} editor - The codemirror instance bound to the cell
-     * @param {event} event - key press event which either should or should not be handled by CodeMirror
-     * @return {Boolean} `true` if CodeMirror should ignore the event, `false` Otherwise
-     */
-    Cell.prototype.handle_codemirror_keyevent = function (editor, event) {
-        var shortcuts = this.keyboard_manager.edit_shortcuts;
-
-        var cur = editor.getCursor();
-        if((cur.line !== 0 || cur.ch !==0) && event.keyCode === 38){
-            event._ipkmIgnore = true;
-        }
-        var nLastLine = editor.lastLine();
-        if ((event.keyCode === 40) &&
-             ((cur.line !== nLastLine) ||
-               (cur.ch !== editor.getLineHandle(nLastLine).text.length))
-           ) {
-            event._ipkmIgnore = true;
-        }
-        // if this is an edit_shortcuts shortcut, the global keyboard/shortcut
-        // manager will handle it
-        if (shortcuts.handles(event)) {
-            return true;
-        }
-        
-        return false;
-    };
-
-
-    /**
-     * Triger typesetting of math by mathjax on current cell element
-     * @method typeset
-     */
-    Cell.prototype.typeset = function () {
-        utils.typeset(this.element);
-    };
-
-    /**
-     * handle cell level logic when a cell is selected
-     * @method select
-     * @return is the action being taken
-     */
-    Cell.prototype.select = function (moveanchor) {
-        // if anchor is true, set the move the anchor
-        moveanchor = (moveanchor === undefined)? true:moveanchor;
-        if(moveanchor){
-            this.anchor=true;
-        }
-
-        if (!this.selected) {
-            this.element.addClass('selected');
-            this.element.removeClass('unselected');
-            this.selected = true;
-            // disable 'insert image' menu item (specific cell types will enable
-            // it in their override select())
-            this.notebook.set_insert_image_enabled(false);
-            return true;
-        } else {
-            return false;
-        }
-    };
-
-    /**
-     * handle cell level logic when the cell is unselected
-     * @method unselect
-     * @return is the action being taken
-     */
-    Cell.prototype.unselect = function (moveanchor) {
-        // if anchor is true, remove also the anchor
-        moveanchor = (moveanchor === undefined)? true:moveanchor;
-        if (moveanchor){
-            this.anchor = false;
-        }
-        if (this.selected) {
-            this.element.addClass('unselected');
-            this.element.removeClass('selected');
-            this.selected = false;
-            return true;
-        } else {
-            return false;
-        }
-    };
-    
-
-    /**
-     * should be overwritten by subclass
-     * @method execute
-     */
-    Cell.prototype.execute = function () {
-        return;
-    };
-
-    /**
-     * handle cell level logic when a cell is rendered
-     * @method render
-     * @return is the action being taken
-     */
-    Cell.prototype.render = function () {
-        if (!this.rendered) {
-            this.element.addClass('rendered');
-            this.element.removeClass('unrendered');
-            this.rendered = true;
-            return true;
-        } else {
-            return false;
-        }
-    };
-
-    /**
-     * handle cell level logic when a cell is unrendered
-     * @method unrender
-     * @return is the action being taken
-     */
-    Cell.prototype.unrender = function () {
-        if (this.rendered) {
-            this.element.addClass('unrendered');
-            this.element.removeClass('rendered');
-            this.rendered = false;
-            return true;
-        } else {
-            return false;
-        }
-    };
-
-    /**
-     * Delegates keyboard shortcut handling to either Jupyter keyboard
-     * manager when in command mode, or CodeMirror when in edit mode
-     *
-     * @method handle_keyevent
-     * @param {CodeMirror} editor - The codemirror instance bound to the cell
-     * @param {event} - key event to be handled
-     * @return {Boolean} `true` if CodeMirror should ignore the event, `false` Otherwise
-     */
-    Cell.prototype.handle_keyevent = function (editor, event) {
-        if (this.mode === 'command') {
-            return true;
-        } else if (this.mode === 'edit') {
-            return this.handle_codemirror_keyevent(editor, event);
-        }
-    };
-
-    /**
-     * @method at_top
-     * @return {Boolean}
-     */
-    Cell.prototype.at_top = function () {
-        var cm = this.code_mirror;
-        var cursor = cm.getCursor();
-        if (cursor.line === 0 && cursor.ch === 0) {
-            return true;
-        }
-        return false;
-    };
-
-    /**
-     * @method at_bottom
-     * @return {Boolean}
-     * */
-    Cell.prototype.at_bottom = function () {
-        var cm = this.code_mirror;
-        var cursor = cm.getCursor();
-        if (cursor.line === (cm.lineCount()-1) && cursor.ch === cm.getLine(cursor.line).length) {
-            return true;
-        }
-        return false;
-    };
-
-    /**
-     * enter the command mode for the cell
-     * @method command_mode
-     * @return is the action being taken
-     */
-    Cell.prototype.command_mode = function () {
-        if (this.mode !== 'command') {
-            this.mode = 'command';
-            return true;
-        } else {
-            return false;
-        }
-    };
-
-    /**
-     * enter the edit mode for the cell
-     * @method command_mode
-     * @return is the action being taken
-     */
-    Cell.prototype.edit_mode = function () {
-        if (this.mode !== 'edit') {
-            this.mode = 'edit';
-            return true;
-        } else {
-            return false;
-        }
-    };
-
-    Cell.prototype.ensure_focused = function() {
-        if(this.element !== document.activeElement && !this.code_mirror.hasFocus()){
-            this.focus_cell();
-        }
-    };
-    
-    /**
-     * Focus the cell in the DOM sense
-     * @method focus_cell
-     */
-    Cell.prototype.focus_cell = function () {
-        this.element.focus();
-        this._on_click({});
-    };
-
-    /**
-     * Focus the editor area so a user can type
-     *
-     * NOTE: If codemirror is focused via a mouse click event, you don't want to
-     * call this because it will cause a page jump.
-     * @method focus_editor
-     */
-    Cell.prototype.focus_editor = function () {
-        this.refresh();
-        this.code_mirror.focus();
-    };
-
-    /**
-     * Refresh codemirror instance
-     * @method refresh
-     */
-    Cell.prototype.refresh = function () {
-        if (this.code_mirror) {
-            this.code_mirror.refresh();
-        }
-    };
-
-    /**
-     * should be overwritten by subclass
-     * @method get_text
-     */
-    Cell.prototype.get_text = function () {
-    };
-
-    /**
-     * should be overwritten by subclass
-     * @method set_text
-     * @param {string} text
-     */
-    Cell.prototype.set_text = function (text) {
-    };
-
-    /**
-     * should be overwritten by subclass
-     * serialise cell to json.
-     * @method toJSON
-     **/
-    Cell.prototype.toJSON = function () {
-        var data = {};
-        // deepcopy the metadata so copied cells don't share the same object
-        data.metadata = JSON.parse(JSON.stringify(this.metadata));
-        if (this.id !== undefined) {
-            data.id = this.id;
-        }
-        if (data.metadata.deletable) {
-            delete data.metadata.deletable;
-        }
-        if (data.metadata.editable) {
-            delete data.metadata.editable;
-        }
-        if (data.metadata.collapsed === false) {
-            delete data.metadata.collapsed;
-        }
-        data.cell_type = this.cell_type;
-        return data;
-    };
-
-    /**
-     * should be overwritten by subclass
-     * @method fromJSON
-     **/
-    Cell.prototype.fromJSON = function (data) {
-        if (data.metadata !== undefined) {
-            this.metadata = data.metadata;
-        }
-        if (data.id !== undefined) {
-            this.id = data.id;
-        }
-    };
-
-
-    /**
-     * can the cell be split into two cells (false if not deletable)
-     *
-     * @method is_splittable
-     **/
-    Cell.prototype.is_splittable = function () {
-        return this.is_deletable();
-    };
-
-
-    /**
-     * can the cell be merged with other cells (false if not deletable)
-     * @method is_mergeable
-     **/
-    Cell.prototype.is_mergeable = function () {
-        return this.is_deletable();
-    };
-
-    /**
-     * is the cell edtitable? only false (readonly) if
-     * metadata.editable is explicitly false -- everything else
-     * counts as true
-     *
-     * @method is_editable
-     **/
-    Cell.prototype.is_editable = function () {
-        if (this.metadata.editable === false) {
-            return false;
-        }
-        return true;
-    };
-
-    /**
-     * is the cell deletable? only false (undeletable) if
-     * metadata.deletable is explicitly false or if the cell is not
-     * editable -- everything else counts as true
-     *
-     * @method is_deletable
-     **/
-    Cell.prototype.is_deletable = function () {
-        if (this.metadata.deletable === false || !this.is_editable()) {
-            return false;
-        }
-        return true;
-    };
-
-    /**
-     * @return {String} - the text before the cursor
-     * @method get_pre_cursor
-     **/
-    Cell.prototype.get_pre_cursor = function () {
-        var cursor = this.code_mirror.getCursor();
-        var text = this.code_mirror.getRange({line:0, ch:0}, cursor);
-        text = text.replace(/^\n+/, '').replace(/\n+$/, '');
-        return text;
-    };
-
-
-    /**
-     * @return {String} - the text after the cursor
-     * @method get_post_cursor
-     **/
-    Cell.prototype.get_post_cursor = function () {
-        var cursor = this.code_mirror.getCursor();
-        var last_line_num = this.code_mirror.lineCount()-1;
-        var last_line_len = this.code_mirror.getLine(last_line_num).length;
-        var end = {line:last_line_num, ch:last_line_len};
-        var text = this.code_mirror.getRange(cursor, end);
-        text = text.replace(/^\n+/, '').replace(/\n+$/, '');
-        return text;
-    };
-
-
-    /**
-     * @return {Array} - the text between cursors and within selections (multicursor/sorted)
-     * @method get_split_text
-     **/
-    Cell.prototype.get_split_text = function () {
-        var start = {line:0, ch:0};
-        var last_line_num = this.code_mirror.lineCount()-1;
-        var last_line_len = this.code_mirror.getLine(last_line_num).length;
-        var end = {line:last_line_num, ch:last_line_len};
-
-        var flag_empty_cell = is_single_cursor(start, end);
-        var flag_first_position = false;
-        var flag_last_position = false;
-        var flag_all_select = false;
-
-        var ranges = this.code_mirror.listSelections();
-
-        var cursors = [start];
-
-        for (var i = 0; i < ranges.length; i++) {
-            // append both to handle selections
-            // ranges[i].head.sticky is null if ctrl-a select
-            if ((ranges[i].head.sticky == 'before') || (ranges[i].head.sticky === null )) {
-                cursors.push(ranges[i].anchor);
-                cursors.push(ranges[i].head);
-                if (is_single_cursor(ranges[i].anchor, start) &&
-                    is_single_cursor(ranges[i].head, end)) {
-                    flag_all_select = true;
-                }
-            } else {
-                cursors.push(ranges[i].head);
-                cursors.push(ranges[i].anchor);
-                if (is_single_cursor(ranges[i].head, start) &&
-                    is_single_cursor(ranges[i].anchor, end)) {
-                    flag_all_select = true;
-                }
-            }
-            // single cursor at beginning or end of cell
-            if (is_single_cursor(ranges[i].head, ranges[i].anchor)) {
-                if (is_single_cursor(ranges[i].head, start)) flag_first_position = true;
-                if (is_single_cursor(ranges[i].head, end)) flag_last_position = true;
-            }
-        }
-        cursors.push(end);
-
-        // Cursors is now sorted, but likely has duplicates due to anchor and head being the same for cursors
-        var locations = [cursors[0]];
-        for (var i = 1; i < cursors.length; i++) {
-            var last = locations[locations.length-1];
-            var current = cursors[i];
-            if ((last.line != current.line) || (last.ch != current.ch)) {
-                locations.push(cursors[i]);
-            }
-        }
-
-        // Split text
-        var text_list = [];
-        // Split single cursors at first position
-        if (flag_empty_cell || flag_first_position) text_list.push('');
-        for (var i = 1; i < locations.length; i++) {
-            var text = this.code_mirror.getRange(locations[i-1], locations[i]);
-            text = text.replace(/^\n+/, '').replace(/\n+$/, ''); // removes newlines at beginning and end
-            text_list.push(text);
-        }
-        // Split single cursors at last position
-        if (flag_last_position) text_list.push('');
-        // Duplicate cell if full cell is selected
-        if ((text_list.length == 1) && flag_all_select && !flag_empty_cell) {
-            text_list = text_list.concat(text_list);
-        }
-        return text_list;
-    };
-
-    /**
-     * Show/Hide CodeMirror LineNumber
-     * @method show_line_numbers
-     *
-     * @param value {Bool}  show (true), or hide (false) the line number in CodeMirror
-     **/
-    Cell.prototype.show_line_numbers = function (value) {
-        this.code_mirror.setOption('lineNumbers', value);
-        this.code_mirror.refresh();
-    };
-
-    /**
-     * Toggle  CodeMirror LineNumber
-     * @method toggle_line_numbers
-     **/
-    Cell.prototype.toggle_line_numbers = function () {
-        var val = this.code_mirror.getOption('lineNumbers');
-        this.show_line_numbers(!val);
-    };
-
-    /**
-     * Force codemirror highlight mode
-     * @method force_highlight
-     * @param {object} - CodeMirror mode
-     **/
-    Cell.prototype.force_highlight = function(mode) {
-        this.user_highlight = mode;
-        this.auto_highlight();
-    };
-    
-    /**
-     * Trigger autodetection of highlight scheme for current cell
-     * @method auto_highlight
-     */
-    Cell.prototype.auto_highlight = function () {
-        this._auto_highlight(this.class_config.get_sync('highlight_modes'));
-    };
-    
-    /**
-     * Try to autodetect cell highlight mode, or use selected mode
-     * @methods _auto_highlight
-     * @private
-     * @param {String|object|undefined} - CodeMirror mode | 'auto'
-     **/
-    Cell.prototype._auto_highlight = function (modes) {
-        /**
-         *Here we handle manually selected modes
-         */
-        var that = this;
-        var mode;
-        if( this.user_highlight !== undefined &&  this.user_highlight != 'auto' )
-        {
-            mode = this.user_highlight;
-            CodeMirror.autoLoadMode(this.code_mirror, mode);
-            this.code_mirror.setOption('mode', mode);
-            return;
-        }
-        var current_mode = this.code_mirror.getOption('mode', mode);
-        var first_line = this.code_mirror.getLine(0);
-        // loop on every pairs
-        for(mode in modes) {
-            var regs = modes[mode].reg;
-            // only one key every time but regexp can't be keys...
-            for(var i=0; i<regs.length; i++) {
-                // here we handle non magic_modes.
-                // TODO :
-                // On 3.0 and below, these things were regex.
-                // But now should be string for json-able config. 
-                // We should get rid of assuming they might be already 
-                // in a later version of Jupyter.
-                var re = regs[i];
-                if(typeof(re) === 'string'){
-                    re = new RegExp(re);
-                }
-                if(first_line.match(re) !== null) {
-                    if(current_mode == mode){
-                        return;
-                    }
-                    if (mode.search('magic_') !== 0) {
-                        utils.requireCodeMirrorMode(mode, function (spec) {
-                            that.code_mirror.setOption('mode', spec);
-                        });
-                        return;
-                    }
-                    var magic_mode = mode;
-                    mode = magic_mode.substr(6);
-                    if(current_mode == magic_mode){
-                        return;
-                    }
-                    utils.requireCodeMirrorMode(mode, function (spec) {
-                        // Add an overlay mode to recognize the first line as "magic" instead
-                        // of the mode used for the rest of the cell.
-                        CodeMirror.defineMode(magic_mode, function(config) {
-                            var magicOverlay = {
-                                startState: function() {
-                                    return {firstMatched : false, inMagicLine: false};
-                                },
-                                token: function(stream, state) {
-                                    if(!state.firstMatched) {
-                                        state.firstMatched = true;
-                                        if (stream.match("%%", false)) {
-                                            state.inMagicLine = true;
-                                        }
-                                    }
-                                    if (state.inMagicLine) {
-                                        stream.eat(function any(ch) { return true; });
-                                        if (stream.eol()) {
-                                            state.inMagicLine = false;
-                                        }
-                                        return "magic";
-                                    }
-                                    stream.skipToEnd();
-                                    return null;
-                                }
-                            };
-                            return CodeMirror.overlayMode(CodeMirror.getMode(config, spec), magicOverlay);
-                        });
-                        that.code_mirror.setOption('mode', magic_mode);
-                    });
-                    return;
-                }
-            }
-        }
-        // fallback on default
-        var default_mode;
-        try {
-            default_mode = this._options.cm_config.mode;
-        } catch(e) {
-            default_mode = 'text/plain';
-        }
-        if( current_mode === default_mode){
-            return;
-        }
-        this.code_mirror.setOption('mode', default_mode);
-    };
-
-    var UnrecognizedCell = function (options) {
-        /** Constructor for unrecognized cells */
-        Cell.apply(this, arguments);
-        this.cell_type = 'unrecognized';
-        this.celltoolbar = null;
-        this.data = {};
-        
-        Object.seal(this);
-    };
-
-    UnrecognizedCell.prototype = Object.create(Cell.prototype);
-    
-    
-    // cannot merge or split unrecognized cells
-    UnrecognizedCell.prototype.is_mergeable = function () {
-        return false;
-    };
-    
-    UnrecognizedCell.prototype.is_splittable = function () {
-        return false;
-    };
-    
-    UnrecognizedCell.prototype.toJSON = function () {
-        /**
-         * deepcopy the metadata so copied cells don't share the same object
-         */
-        return JSON.parse(JSON.stringify(this.data));
-    };
-
-    UnrecognizedCell.prototype.fromJSON = function (data) {
-        this.data = data;
-        if (data.metadata !== undefined) {
-            this.metadata = data.metadata;
-        } else {
-            data.metadata = this.metadata;
-        }
-        this.element.find('.inner_cell').find("a").text(i18n.msg.sprintf(i18n.msg._("Unrecognized cell type: %s"), data.cell_type));
-    };
-    
-    UnrecognizedCell.prototype.create_element = function () {
-        Cell.prototype.create_element.apply(this, arguments);
-        var cell = this.element = $("<div>").addClass('cell unrecognized_cell');
-        cell.attr('tabindex','2');
-
-        var prompt = $('<div/>').addClass('prompt input_prompt');
-        cell.append(prompt);
-        var inner_cell = $('<div/>').addClass('inner_cell');
-        inner_cell.append(
-            $("<a>")
-                .attr("href", "#")
-                .text(i18n.msg._("Unrecognized cell type"))
-        );
-        cell.append(inner_cell);
-        this.element = cell;
-    };
-
-    UnrecognizedCell.prototype.bind_events = function () {
-        Cell.prototype.bind_events.apply(this, arguments);
-        var cell = this;
-        
-        this.element.find('.inner_cell').find("a").click(function () {
-            cell.events.trigger('unrecognized_cell.Cell', {cell: cell});
-        });
-    };
-
-    return {
-        Cell: Cell,
-        UnrecognizedCell: UnrecognizedCell
-    };
-});
diff --git a/notebook/static/notebook/js/celltoolbar.js b/notebook/static/notebook/js/celltoolbar.js
deleted file mode 100644
index 889f3c6ef..000000000
--- a/notebook/static/notebook/js/celltoolbar.js
+++ /dev/null
@@ -1,470 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'base/js/events',
-    'base/js/i18n'
-], function($, IPython, events, i18n) {
-    "use strict";
-
-    var CellToolbar = function (options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance 
-         *          cell: Cell instance
-         *          notebook: Notebook instance 
-         *
-         *  TODO: This leaks, when cell are deleted
-         *  There is still a reference to each celltoolbars.
-         */
-        CellToolbar._instances.push(this);
-        this.notebook = options.notebook;
-        this.cell = options.cell;
-        this.create_element();
-        this.rebuild();
-        return this;
-    };
-
-
-    CellToolbar.prototype.create_element = function () {
-        this.inner_element = $('<div/>').addClass('celltoolbar');
-        this.element = $('<div/>').addClass('ctb_hideshow')
-            .append(this.inner_element);
-    };
-
-
-    // The default css style for the outer celltoolbar div
-    // (ctb_hideshow) is display: none.
-    // To show the cell toolbar, *both* of the following conditions must be met:
-    // - A parent container has class `ctb_global_show`
-    // - The celltoolbar has the class `ctb_show`
-    // This allows global show/hide, as well as per-cell show/hide.
-
-    CellToolbar.global_hide = function () {
-        $('body').removeClass('ctb_global_show');
-    };
-
-
-    CellToolbar.global_show = function () {
-        $('body').addClass('ctb_global_show');
-    };
-
-
-    CellToolbar.prototype.hide = function () {
-        this.element.removeClass('ctb_show');
-    };
-
-
-    CellToolbar.prototype.show = function () {
-        this.element.addClass('ctb_show');
-    };
-
-
-    /**
-     * Class variable that should contain a dict of all available callback
-     * we need to think of wether or not we allow nested namespace
-     * @property _callback_dict
-     * @private
-     * @static
-     * @type Dict
-     */
-    CellToolbar._callback_dict = {};
-
-
-    /**
-     * Class variable that should contain the reverse order list of the button
-     * to add to the toolbar of each cell
-     * @property _ui_controls_list
-     * @private
-     * @static
-     * @type List
-     */
-    CellToolbar._ui_controls_list = [];
-
-
-    /**
-     * Class variable that should contain the CellToolbar instances for each
-     * cell of the notebook
-     *
-     * @private
-     * @property _instances
-     * @static
-     * @type List
-     */
-    CellToolbar._instances = [];
-
-
-    /**
-     * keep a list of all the available presets for the toolbar
-     * @private
-     * @property _presets
-     * @static
-     * @type Dict
-     */
-    CellToolbar._presets = {};
-
-
-    // this is by design not a prototype.
-    /**
-     * Register a callback to create an UI element in a cell toolbar.
-     * @method register_callback
-     * @param name {String} name to use to refer to the callback. It is advised to use a prefix with the name
-     * for easier sorting and avoid collision
-     * @param callback {function(div, cell)} callback that will be called to generate the ui element
-     * @param [cell_types] {List_of_String|undefined} optional list of cell types. If present the UI element
-     * will be added only to cells of types in the list.
-     *
-     *
-     * The callback will receive the following element :
-     *
-     *    * a div in which to add element.
-     *    * the cell it is responsible from
-     *
-     * @example
-     *
-     * Example that create callback for a button that toggle between `true` and `false` label,
-     * with the metadata under the key 'foo' to reflect the status of the button.
-     *
-     *      // first param reference to a DOM div
-     *      // second param reference to the cell.
-     *      var toggle =  function(div, cell) {
-     *          var button_container = $(div)
-     *
-     *          // let's create a button that show the  current value of the metadata
-     *          var button = $('<div/>').button({label:String(cell.metadata.foo)});
-     *
-     *          // On click, change the metadata value and update the button label
-     *          button.click(function(){
-     *                      var v = cell.metadata.foo;
-     *                      cell.metadata.foo = !v;
-     *                      button.button("option", "label", String(!v));
-     *                  })
-     *
-     *          // add the button to the DOM div.
-     *          button_container.append(button);
-     *      }
-     *
-     *      // now we register the callback under the name `foo` to give the
-     *      // user the ability to use it later
-     *      CellToolbar.register_callback('foo', toggle);
-     */
-    CellToolbar.register_callback = function(name, callback, cell_types) {
-        // Overwrite if it already exists.
-        CellToolbar._callback_dict[name] = cell_types ? {callback: callback, cell_types: cell_types} : callback;
-    };
-
-
-    /**
-     * Register a preset of UI element in a cell toolbar.
-     * Not supported Yet.
-     * @method register_preset
-     * @param name {String} name to use to refer to the preset. It is advised to use a prefix with the name
-     * for easier sorting and avoid collision
-     * @param  preset_list {List_of_String} reverse order of the button in the toolbar. Each String of the list
-     *          should correspond to a name of a registered callback.
-     *
-     * @private
-     * @example
-     *
-     *      CellToolbar.register_callback('foo.c1', function(div, cell){...});
-     *      CellToolbar.register_callback('foo.c2', function(div, cell){...});
-     *      CellToolbar.register_callback('foo.c3', function(div, cell){...});
-     *      CellToolbar.register_callback('foo.c4', function(div, cell){...});
-     *      CellToolbar.register_callback('foo.c5', function(div, cell){...});
-     *
-     *      CellToolbar.register_preset('foo.foo_preset1', ['foo.c1', 'foo.c2', 'foo.c5'])
-     *      CellToolbar.register_preset('foo.foo_preset2', ['foo.c4', 'foo.c5'])
-     */
-    CellToolbar.register_preset = function(name, preset_list, notebook) {
-        CellToolbar._presets[name] = preset_list;
-        events.trigger('preset_added.CellToolbar', {name: name});
-        // When "register_callback" is called by a custom extension, it may be executed after notebook is loaded.
-        // In that case, activate the preset if needed.
-        if (notebook && notebook.metadata && notebook.metadata.celltoolbar === name){
-            CellToolbar.activate_preset(name);
-        }
-    };
-
-    /**
-     * unregister the selected preset, 
-     *
-     * return true if preset successfully unregistered
-     * false otherwise
-     *
-     **/
-    CellToolbar.unregister_preset = function(name){
-        if(CellToolbar._presets[name]){
-            delete CellToolbar._presets[name];
-            events.trigger('unregistered_preset.CellToolbar', {name: name});
-            return true
-        }
-        return false
-    }
-
-
-    /**
-     * List the names of the presets that are currently registered.
-     *
-     * @method list_presets
-     * @static
-     */
-    CellToolbar.list_presets = function() {
-        var keys = [];
-        for (var k in CellToolbar._presets) {
-            keys.push(k);
-        }
-        return keys;
-    };
-
-
-    /**
-     * Activate an UI preset from `register_preset`
-     *
-     * This does not update the selection UI.
-     *
-     * @method activate_preset
-     * @param preset_name {String} string corresponding to the preset name
-     *
-     * @static
-     * @private
-     * @example
-     *
-     *      CellToolbar.activate_preset('foo.foo_preset1');
-     */
-    CellToolbar.activate_preset = function(preset_name){
-        var preset = CellToolbar._presets[preset_name];
-
-        if(preset !== undefined){
-            CellToolbar._ui_controls_list = preset;
-            CellToolbar.rebuild_all();
-        }
-
-        events.trigger('preset_activated.CellToolbar', {name: preset_name});
-    };
-
-
-    /**
-     * This should be called on the class and not on a instance as it will trigger
-     * rebuild of all the instances.
-     * @method rebuild_all
-     * @static
-     *
-     */
-    CellToolbar.rebuild_all = function(){
-        for(var i=0; i < CellToolbar._instances.length; i++){
-            CellToolbar._instances[i].rebuild();
-        }
-    };
-
-    /**
-     * Rebuild all the button on the toolbar to update its state.
-     * @method rebuild
-     */
-    CellToolbar.prototype.rebuild = function(){
-        /**
-         * strip everything from the div
-         * which is probably inner_element
-         * or this.element.
-         */
-        this.inner_element.empty();
-        this.ui_controls_list = [];
-
-        var callbacks = CellToolbar._callback_dict;
-        var preset = CellToolbar._ui_controls_list;
-        // Yes we iterate on the class variable, not the instance one.
-        for (var i=0; i < preset.length; i++) {
-            var key = preset[i];
-            var callback = callbacks[key];
-            if (!callback) continue;
-
-            if (typeof callback === 'object') {
-                if (callback.cell_types.indexOf(this.cell.cell_type) === -1) continue;
-                callback = callback.callback;
-            }
-            
-            var local_div = $('<div/>').addClass('button_container');
-            try {
-                callback(local_div, this.cell, this);
-                this.ui_controls_list.push(key);
-            } catch (e) {
-                console.log(i18n.msg.sprintf(i18n.msg._("Error in cell toolbar callback %s"), key), e);
-                continue;
-            }
-            // only append if callback succeeded.
-            this.inner_element.append(local_div);
-        }
-
-        // If there are no controls or the cell is a rendered TextCell hide the toolbar.
-        if (!this.ui_controls_list.length) {
-            this.hide();
-        } else {
-            this.show();
-        }
-    };
-
-
-    CellToolbar.utils = {};
-
-
-    /**
-     * A utility function to generate bindings between a checkbox and cell/metadata
-     * @method utils.checkbox_ui_generator
-     * @static
-     *
-     * @param name {string} Label in front of the checkbox
-     * @param setter {function( cell, newValue )}
-     *        A setter method to set the newValue
-     * @param getter {function( cell )}
-     *        A getter methods which return the current value.
-     *
-     * @return callback {function( div, cell )} Callback to be passed to `register_callback`
-     *
-     * @example
-     *
-     * An exmple that bind the subkey `slideshow.isSectionStart` to a checkbox with a `New Slide` label
-     *
-     *     var newSlide = CellToolbar.utils.checkbox_ui_generator('New Slide',
-     *          // setter
-     *          function(cell, value){
-     *              // we check that the slideshow namespace exist and create it if needed
-     *              if (cell.metadata.slideshow == undefined){cell.metadata.slideshow = {}}
-     *              // set the value
-     *              cell.metadata.slideshow.isSectionStart = value
-     *              },
-     *          // getter
-     *          function(cell){ var ns = cell.metadata.slideshow;
-     *              // if the slideshow namespace does not exist return `undefined`
-     *              // (will be interpreted as `false` by checkbox) otherwise
-     *              // return the value
-     *              return (ns == undefined)? undefined: ns.isSectionStart
-     *              }
-     *      );
-     *
-     *      CellToolbar.register_callback('newSlide', newSlide);
-     *
-     */
-    CellToolbar.utils.checkbox_ui_generator = function(name, setter, getter){
-        return function(div, cell, celltoolbar) {
-            var button_container = $(div);
-
-            var chkb = $('<input/>').attr('type', 'checkbox');
-            var lbl = $('<label/>').append($('<span/>').text(name));
-            chkb.attr("checked", getter(cell));
-
-            chkb.click(function(){
-                        var v = getter(cell);
-                        setter(cell, !v);
-                        chkb.attr("checked", !v);
-            });
-            button_container.append($('<span/>').append(lbl).append(chkb));
-        };
-    };
-
-
-    /**
-     * A utility function to generate bindings between a input field and cell/metadata
-     * @method utils.input_ui_generator
-     * @static
-     *
-     * @param name {string} Label in front of the input field
-     * @param setter {function( cell, newValue )}
-     *        A setter method to set the newValue
-     * @param getter {function( cell )}
-     *        A getter methods which return the current value.
-     *
-     * @return callback {function( div, cell )} Callback to be passed to `register_callback`
-     *
-     */
-    CellToolbar.utils.input_ui_generator = function(name, setter, getter){
-        return function(div, cell, celltoolbar) {
-            var button_container = $(div);
-
-            var text = $('<input/>').attr('type', 'text');
-            var lbl = $('<label/>').append($('<span/>').text(name));
-            text.attr("value", getter(cell));
-
-            text.keyup(function(){
-                setter(cell, text.val());
-            });
-            button_container.append($('<span/>').append(lbl).append(text));
-            IPython.keyboard_manager.register_events(text);
-        };
-    };
-
-    /**
-     * A utility function to generate bindings between a dropdown list cell
-     * @method utils.select_ui_generator
-     * @static
-     *
-     * @param list_list {list_of_sublist} List of sublist of metadata value and name in the dropdown list.
-     *        sublist should contain 2 element each, first a string that would be displayed in the dropdown list,
-     *        and second the corresponding value to  be passed to setter/return by getter. the corresponding value
-     *        should not be "undefined" or behavior can be unexpected.
-     * @param setter {function( cell, newValue )}
-     *        A setter method to set the newValue
-     * @param getter {function( cell )}
-     *        A getter methods which return the current value of the metadata.
-     * @param [label=""] {String} optional label for the dropdown menu
-     *
-     * @return callback {function( div, cell )} Callback to be passed to `register_callback`
-     *
-     * @example
-     *
-     *      var select_type = CellToolbar.utils.select_ui_generator([
-     *              ["<None>"       , "None"      ],
-     *              ["Header Slide" , "header_slide" ],
-     *              ["Slide"        , "slide"        ],
-     *              ["Fragment"     , "fragment"     ],
-     *              ["Skip"         , "skip"         ],
-     *              ],
-     *              // setter
-     *              function(cell, value){
-     *                  // we check that the slideshow namespace exist and create it if needed
-     *                  if (cell.metadata.slideshow == undefined){cell.metadata.slideshow = {}}
-     *                  // set the value
-     *                  cell.metadata.slideshow.slide_type = value
-     *                  },
-     *              // getter
-     *              function(cell){ var ns = cell.metadata.slideshow;
-     *                  // if the slideshow namespace does not exist return `undefined`
-     *                  // (will be interpreted as `false` by checkbox) otherwise
-     *                  // return the value
-     *                  return (ns == undefined)? undefined: ns.slide_type
-     *                  }
-     *      CellToolbar.register_callback('slideshow.select', select_type);
-     *
-     */
-    CellToolbar.utils.select_ui_generator = function(list_list, setter, getter, label) {
-        label = label || "";
-        return function(div, cell, celltoolbar) {
-            var button_container = $(div);
-            var lbl = $("<label/>").append($('<span/>').text(label));
-            var select = $('<select/>');
-            if(!cell.is_editable()){
-                select.attr("disabled","disabled")
-            }
-            for(var i=0; i < list_list.length; i++){
-                var opt = $('<option/>')
-                    .attr('value', list_list[i][1])
-                    .text(list_list[i][0]);
-                select.append(opt);
-            }
-            select.val(getter(cell));
-            select.change(function(){
-                        setter(cell, select.val());
-                    });
-            button_container.append($('<span/>').append(lbl).append(select));
-        };
-    };
-
-    // Backwards compatibility.
-    IPython.CellToolbar = CellToolbar;
-
-    return {'CellToolbar': CellToolbar};
-});
diff --git a/notebook/static/notebook/js/celltoolbarpresets/attachments.js b/notebook/static/notebook/js/celltoolbarpresets/attachments.js
deleted file mode 100644
index 6419a94c6..000000000
--- a/notebook/static/notebook/js/celltoolbarpresets/attachments.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'notebook/js/celltoolbar',
-    'base/js/dialog',
-    'base/js/i18n'
-], function(celltoolbar, dialog, i18n) {
-    "use strict";
-
-    var CellToolbar = celltoolbar.CellToolbar;
-
-    var edit_attachments_dialog = function(cell) {
-        dialog.edit_attachments({
-          attachments: cell.attachments,
-          callback: function(attachments) {
-            cell.attachments = attachments;
-            // Force cell refresh
-            cell.unrender();
-            cell.render();
-          },
-          name: 'Cell',
-          notebook: cell.notebook,
-          keyboard_manager: cell.keyboard_manager
-        });
-    };
-
-    var add_dialog_button = function(div, cell) {
-        var button_container = $(div);
-        var button = $('<button />')
-            .addClass('btn btn-default btn-xs')
-            .text(i18n.msg._('Edit Attachments'))
-            .click( function() {
-              edit_attachments_dialog(cell);
-              return false;
-            });
-        button_container.append(button);
-    };
-
-    var register = function(notebook) {
-      CellToolbar.register_callback('attachments.edit', add_dialog_button);
-
-      var attachments_preset = [];
-      attachments_preset.push('attachments.edit');
-
-      CellToolbar.register_preset(i18n.msg._('Attachments'), attachments_preset, notebook);
-
-    };
-    return {'register' : register};
-});
diff --git a/notebook/static/notebook/js/celltoolbarpresets/default.js b/notebook/static/notebook/js/celltoolbarpresets/default.js
deleted file mode 100644
index e4a591430..000000000
--- a/notebook/static/notebook/js/celltoolbarpresets/default.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'notebook/js/celltoolbar',
-    'base/js/dialog',
-    'base/js/i18n'
-], function(celltoolbar, dialog, i18n) {
-    "use strict";
-
-    var CellToolbar = celltoolbar.CellToolbar;
-
-    var raw_edit = function (cell , edit_metadata_button) {
-        dialog.edit_metadata({
-            md: cell.metadata,
-            callback: function (md) {
-                cell.metadata = md;
-            },
-            name: i18n.msg._('Cell'),
-            notebook: this.notebook,
-            keyboard_manager: this.keyboard_manager,
-            edit_metadata_button: edit_metadata_button
-        });
-    };
-
-    var add_raw_edit_button = function(div, cell) {
-        var button_container = $(div);
-        var button = $('<button/>')
-            .addClass("btn btn-default btn-xs")
-            .text(i18n.msg._("Edit Metadata"))
-            .click( function () {
-                raw_edit(cell, this);
-                return false;
-            });
-
-        button_container.append(button);
-    };
-
-    var register = function (notebook) {
-        CellToolbar.register_callback('default.rawedit', add_raw_edit_button);
-        raw_edit = $.proxy(raw_edit, {
-            notebook: notebook,
-            keyboard_manager: notebook.keyboard_manager
-        });
-
-        var example_preset = [];
-        example_preset.push('default.rawedit');
-
-        CellToolbar.register_preset(i18n.msg._('Edit Metadata'), example_preset, notebook);
-    };
-    return {'register': register};
-});
diff --git a/notebook/static/notebook/js/celltoolbarpresets/example.js b/notebook/static/notebook/js/celltoolbarpresets/example.js
deleted file mode 100644
index e03c3413c..000000000
--- a/notebook/static/notebook/js/celltoolbarpresets/example.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'notebook/js/celltoolbar',
-], function(celltoolbar) {
-    "use strict";
-
-    var CellToolbar = celltoolbar.CellToolbar;
-
-    var example_preset = [];
-
-    var simple_button = function(div, cell) {
-        var button_container = $(div);
-        var button = $('<div/>').button({icons:{primary:'ui-icon-locked'}});
-        var fun = function(value){
-                try{
-                    if(value){
-                        cell.code_mirror.setOption('readOnly','nocursor');
-                        button.button('option','icons',{primary:'ui-icon-locked'});
-                    } else {
-                        cell.code_mirror.setOption('readOnly',false);
-                        button.button('option','icons',{primary:'ui-icon-unlocked'});
-                    }
-                } catch(e){}
-
-        };
-            fun(cell.metadata.ro);
-            button.click(function(){
-                    var v = cell.metadata.ro;
-                    var locked = !v;
-                    cell.metadata.ro = locked;
-                    fun(locked);
-                    })
-                .css('height','16px')
-                .css('width','35px');
-        button_container.append(button);
-    };
-
-    CellToolbar.register_callback('example.lock',simple_button);
-    example_preset.push('example.lock');
-
-    var toggle_test =  function(div, cell) {
-        var button_container = $(div);
-        var button = $('<div/>')
-            .button({label:String(cell.metadata.foo)}).
-            css('width','65px');
-        button.click(function(){
-                    var v = cell.metadata.foo;
-                    cell.metadata.foo = !v;
-                    button.button("option","label",String(!v));
-                });
-       button_container.append(button);
-    };
-
-    CellToolbar.register_callback('example.toggle',toggle_test);
-    example_preset.push('example.toggle');
-
-    var checkbox_test = CellToolbar.utils.checkbox_ui_generator('Yes/No',
-         // setter
-         function(cell, value){
-             // we check that the slideshow namespace exist and create it if needed
-             if (cell.metadata.yn_test === undefined){cell.metadata.yn_test = {};}
-             // set the value
-             cell.metadata.yn_test.value = value;
-             },
-         // getter
-         function(cell){ var ns = cell.metadata.yn_test;
-             // if the slideshow namespace does not exist return `undefined`
-             // (will be interpreted as `false` by checkbox) otherwise
-             // return the value
-             return (ns === undefined)? undefined: ns.value;
-             }
-    );
-
-
-    CellToolbar.register_callback('example.checkbox',checkbox_test);
-    example_preset.push('example.checkbox');
-
-    var select_test = CellToolbar.utils.select_ui_generator([
-            ["-"            ,undefined      ],
-            ["Header Slide" ,"header_slide" ],
-            ["Slide"        ,"slide"        ],
-            ["Fragment"     ,"fragment"     ],
-            ["Skip"         ,"skip"         ],
-            ],
-            // setter
-            function(cell,value){
-                // we check that the slideshow namespace exist and create it if needed
-                if (cell.metadata.test === undefined){cell.metadata.test = {};}
-                // set the value
-                cell.metadata.test.slide_type = value;
-                },
-            // getter
-            function(cell){ var ns = cell.metadata.test;
-                // if the slideshow namespace does not exist return `undefined`
-                // (will be interpreted as `false` by checkbox) otherwise
-                // return the value
-                return (ns === undefined)? undefined: ns.slide_type;
-                });
-
-    CellToolbar.register_callback('example.select',select_test);
-    example_preset.push('example.select');
-
-    var simple_dialog = function(title,text){
-        var dlg = $('<div/>').attr('title',title)
-            .append($('<p/>').text(text));
-        $(dlg).dialog({
-                autoOpen: true,
-                height: 300,
-                width: 650,
-                modal: true,
-                close: function() {
-                    /**
-                     *cleanup on close
-                     */
-                    $(this).remove();
-                }
-        });
-    };
-
-    var add_simple_dialog_button = function(div, cell) {
-        var help_text = ["This is the Metadata editting UI.",
-                         "It heavily rely on plugin to work ",
-                         "and is still under development. You shouldn't wait too long before",
-                         " seeing some customisable buttons in those toolbar."
-                        ].join('\n');
-        var button_container = $(div);
-        var button = $('<div/>').button({label:'?'})
-                .click(function(){simple_dialog('help',help_text); return false;});
-        button_container.append(button);
-    };
-
-    var register = function (notebook) {
-        CellToolbar.register_callback('example.help',add_simple_dialog_button);
-        example_preset.push('example.help');
-
-        CellToolbar.register_preset('Example',example_preset, notebook);
-        console.log('Example extension for metadata editing loaded.');
-    };
-    return {'register': register};
-});
diff --git a/notebook/static/notebook/js/celltoolbarpresets/rawcell.js b/notebook/static/notebook/js/celltoolbarpresets/rawcell.js
deleted file mode 100644
index 647f00856..000000000
--- a/notebook/static/notebook/js/celltoolbarpresets/rawcell.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'notebook/js/celltoolbar',
-    'base/js/dialog',
-    'base/js/keyboard',
-    'base/js/i18n'
-], function(celltoolbar, dialog, keyboard, i18n) {
-    "use strict";
-
-  var CellToolbar = celltoolbar.CellToolbar;
-  var raw_cell_preset = [];
-
-  var select_type = CellToolbar.utils.select_ui_generator([
-    [i18n.msg._("None"), "-"],
-    ["LaTeX", "text/latex"],
-    ["reST", "text/restructuredtext"],
-    ["HTML", "text/html"],
-    ["Markdown", "text/markdown"],
-    ["Python", "text/x-python"],
-    [i18n.msg._("Custom"), "dialog"],
-
-    ],
-      // setter
-      function(cell, value) {
-        if (value === "-") {
-          delete cell.metadata.raw_mimetype;
-        } else if (value === 'dialog') {
-            var message =
-                i18n.msg._("Set the MIME type of the raw cell:");
-
-            var mimeinput = $('<input/>')
-                .attr('type', 'text')
-                .attr('size', '25')
-                .attr('name', 'mimetype')
-                .val(cell.metadata.raw_mimetype || "-");
-
-            var dialogform = $('<div/>').attr('title', i18n.msg._("Edit MIME type"))
-                .append(
-                    $('<form/>').append(
-                        $('<fieldset/>').append(
-                            $('<label/>')
-                            .attr('for', 'mimetype')
-                            .text(message)
-                            )
-                        .append($('<br/>'))
-                        .append(mimeinput)
-                        )
-                );
-
-            dialog.modal({
-                title: i18n.msg._("Raw Cell MIME Type"),
-                body: dialogform,
-                buttons : {
-                    Cancel: {},
-                    OK: {
-                        class: "btn-primary",
-                        click: function () {
-                            console.log(cell);
-                            cell.metadata.raw_mimetype = $(this).find('input').val();
-                            console.log(cell.metadata);
-                        }
-                    }
-                },
-                notebook: cell.notebook,
-                keyboard_manager: cell.keyboard_manager,
-                open : function (event, ui) {
-                    var that = $(this);
-                    // Upon ENTER, click the OK button.
-                    that.find('input[type="text"]').keydown(function (event, ui) {
-                        if (event.which === keyboard.keycodes.enter) {
-                            that.find('.btn-primary').first().click();
-                            return false;
-                        }
-                    });
-                    that.find('input[type="text"]').focus().select();
-                }
-            });
-        } else {
-          cell.metadata.raw_mimetype = value;
-        }
-      },
-      //getter
-      function(cell) {
-        return cell.metadata.raw_mimetype || "";
-      },
-      // name
-      i18n.msg._("Raw NBConvert Format")
-  );
-
-  var register = function (notebook) {
-    CellToolbar.register_callback('raw_cell.select', select_type, ['raw']);
-    raw_cell_preset.push('raw_cell.select');
-
-    CellToolbar.register_preset(i18n.msg._('Raw Cell Format'), raw_cell_preset, notebook);
-  };
-  return {'register': register};
-
-});
diff --git a/notebook/static/notebook/js/celltoolbarpresets/slideshow.js b/notebook/static/notebook/js/celltoolbarpresets/slideshow.js
deleted file mode 100644
index 67dcd98d6..000000000
--- a/notebook/static/notebook/js/celltoolbarpresets/slideshow.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'notebook/js/celltoolbar',
-    'base/js/i18n'
-], function(celltoolbar, i18n) {
-    "use strict";
-
-    var CellToolbar = celltoolbar.CellToolbar;
-    var slideshow_preset = [];
-
-    var select_type = CellToolbar.utils.select_ui_generator([
-            ["-"            ,"-"            ],
-            [i18n.msg._("Slide")        ,"slide"        ],
-            [i18n.msg._("Sub-Slide")    ,"subslide"     ],
-            [i18n.msg._("Fragment")     ,"fragment"     ],
-            [i18n.msg._("Skip")         ,"skip"         ],
-            [i18n.msg._("Notes")        ,"notes"        ],
-            ],
-            // setter
-            function(cell, value){
-                // we check that the slideshow namespace exist and create it if needed
-                if (cell.metadata.slideshow === undefined){cell.metadata.slideshow = {};}
-                // set the value
-                cell.metadata.slideshow.slide_type = value;
-                },
-            // getter
-            function(cell){ var ns = cell.metadata.slideshow;
-                // if the slideshow namespace does not exist return `undefined`
-                // (will be interpreted as `false` by checkbox) otherwise
-                // return the value
-                return (ns === undefined)? undefined: ns.slide_type;
-                },
-            i18n.msg._("Slide Type"));
-
-    var register = function (notebook) {
-        CellToolbar.register_callback('slideshow.select',select_type);
-        slideshow_preset.push('slideshow.select');
-
-        CellToolbar.register_preset(i18n.msg._('Slideshow'),slideshow_preset, notebook);
-    };
-    return {'register': register};
-});
diff --git a/notebook/static/notebook/js/celltoolbarpresets/tags.js b/notebook/static/notebook/js/celltoolbarpresets/tags.js
deleted file mode 100644
index 16c27ef39..000000000
--- a/notebook/static/notebook/js/celltoolbarpresets/tags.js
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'notebook/js/celltoolbar',
-    'base/js/dialog',
-    'base/js/i18n'
-], function(celltoolbar, dialog, i18n) {
-    "use strict";
-
-    var CellToolbar = celltoolbar.CellToolbar;
-
-    var array_difference = function(a, b) {
-        return a.filter(function(n) {
-            return b.indexOf(n) === -1;
-        });
-    };
-
-    var write_tag = function(cell, name, add) {
-        if (add) {
-            // Add to metadata
-            if (cell.metadata.tags === undefined) {
-                cell.metadata.tags = [];
-            } else if (cell.metadata.tags.indexOf(name) !== -1) {
-                // Tag already exists
-                return false;
-            }
-            cell.metadata.tags.push(name);
-        } else {
-            // Remove from metadata
-            if (!cell.metadata || !cell.metadata.tags) {
-                // No tags to remove
-                return false;
-            }
-            // Remove tag from tags list
-            var index = cell.metadata.tags.indexOf(name);
-            if (index !== -1) {
-                cell.metadata.tags.splice(index, 1);
-            }
-            // If tags list is empty, remove it
-            if (cell.metadata.tags.length === 0) {
-                delete cell.metadata.tags;
-            }
-        }
-        cell.events.trigger('set_dirty.Notebook', {value: true});
-        return true;
-    };
-
-    var preprocess_input = function(input) {
-        // Split on whitespace + commas:
-        return input.split(/[,\s]+/)
-    };
-
-    var add_tag = function(cell, tag_container, on_remove) {
-        return function(name) {
-            if (name === '') {
-                // Skip empty strings
-                return;
-            }
-            // Write tag to metadata
-            var changed = write_tag(cell, name, true);
-
-            if (changed) {
-                // Make tag UI
-                var tag = make_tag(name, on_remove, cell.is_editable());
-                tag_container.append(tag);
-                var tag_map = jQuery.data(tag_container, "tag_map") || {};
-                tag_map[name] = tag;
-                jQuery.data(tag_container, 'tag_map', tag_map);
-            }
-        };
-    };
-
-    var remove_tag = function(cell, tag_container) {
-        return function(name) {
-            var changed = write_tag(cell, name, false);
-            if (changed) {
-                // Remove tag UI
-                var tag_map = jQuery.data(tag_container, "tag_map") || {};
-                var tag_UI = tag_map[name];
-                delete tag_map[name];
-                tag_UI.remove();
-            }
-        };
-    };
-
-    var init_tag_container = function(cell, tag_container, on_remove) {    
-        var tag_list = cell.metadata.tags || [];
-        if (!Array.isArray(tag_list)) {
-            // We cannot make tags UI for this cell!
-            // Maybe someone else used "tags" for something?
-            return false;  // Fail gracefully
-        }
-
-        var tag_map = {};
-        for (var i=0; i < tag_list.length; ++i) {
-            var tag_name = tag_list[i];
-            if (typeof tag_name !== 'string') {
-                // Unexpected type, disable toolbar for safety
-                return false;
-            }
-            var tag = make_tag(tag_name, on_remove, cell.is_editable());
-            tag_container.append(tag);
-            tag_map[tag_name] = tag;
-        }
-        jQuery.data(tag_container, 'tag_map', tag_map);
-        return true;
-    };
-
-    var make_tag = function(name, on_remove, is_editable) {
-        var tag_UI = $('<span/>')
-            .addClass('cell-tag')
-            .text(name);
-
-        if(is_editable){
-            var remove_button = $('<i/>')
-                .addClass('remove-tag-btn')
-                .addClass('fa fa-times')
-                .click(function () {
-                    on_remove(name);
-                    return false;
-                });
-            tag_UI.append(remove_button);
-        }
-        return tag_UI;
-    };
-
-    // Single edit with button to add tags
-    var add_tag_edit = function(div, cell, on_add, on_remove) {
-        var button_container = $(div);
-
-        var text = $('<input/>').attr('type', 'text');
-        var button = $('<button />')
-            .addClass('btn btn-default btn-xs')
-            .text(i18n.msg._('Add tag'))
-            .click(function() {
-                var tags = preprocess_input(text[0].value);
-                for (var i=0; i < tags.length; ++i) {
-                    on_add(tags[i]);
-                }
-                // Clear input after adding:
-                text[0].value = '';
-                return false;
-            });
-        // Wire enter in input to button click
-        text.keyup(function(event){
-            if(event.keyCode == 13){
-                button.click();
-            }
-        });
-        var input_container = $('<span/>')
-            .addClass('tags-input');
-        add_dialog_button(input_container, cell, on_add, on_remove);
-        button_container.append(input_container
-                .append(text)
-                .append(button)
-            );
-        IPython.keyboard_manager.register_events(text);
-    };
-
-    var tag_dialog = function(cell, on_add, on_remove) {
-        var tag_list = cell.metadata.tags || [];
-
-        var message =
-            i18n.msg._("Edit the list of tags below. All whitespace " +
-            "is treated as tag separators.");
-
-        var textarea = $('<textarea/>')
-            .attr('aria-label', i18n.msg._('Edit the tags in the text area'))
-            .attr('rows', '13')
-            .attr('cols', '80')
-            .attr('name', 'tags')
-            .text(tag_list.join('\n'));
-
-        var dialogform = $('<div/>').attr('title', i18n.msg._('Edit the tags'))
-            .append(
-                $('<form/>').append(
-                    $('<fieldset/>').append(
-                        $('<label/>')
-                        .attr('for','tags')
-                        .text(message)
-                        )
-                    .append($('<br/>'))
-                    .append(textarea)
-                    )
-            );
-
-        var modal_obj = dialog.modal({
-            title: i18n.msg._("Edit Tags"),
-            body: dialogform,
-            default_button: "Cancel",
-            buttons: {
-                Cancel: {},
-                Edit: { class : "btn-primary",
-                    click: function() {
-                        var old_tags = cell.metadata.tags || [];
-                        var new_tags = preprocess_input(textarea[0].value);
-                        var added_tags = array_difference(new_tags, old_tags);
-                        var removed_tags = array_difference(old_tags, new_tags);
-                        for (var i=0; i < added_tags.length; ++i) {
-                            on_add(added_tags[i]);
-                        }
-                        for (var i=0; i < removed_tags.length; ++i) {
-                            on_remove(removed_tags[i]);
-                        }
-                    }
-                }
-            },
-            notebook: cell.notebook,
-            keyboard_manager: cell.keyboard_manager,
-        });
-    };
-
-    var add_dialog_button = function(container, cell, on_add, on_remove) {
-        var button = $('<button />')
-            .addClass('btn btn-default btn-xs tags-dialog-btn')
-            .text('...')
-            .click( function() {
-              tag_dialog(cell, on_add, on_remove);
-              return false;
-            });
-        container.append(button);
-    };
-
-    var add_tags_cellbar = function(div, cell) {
-        var button_container = $(div);
-
-        button_container.addClass('tags_button_container');
-
-        var tag_container = $('<span/>').
-            addClass('tag-container');
-        var on_remove = remove_tag(cell, tag_container);
-        var ok = init_tag_container(cell, tag_container, on_remove);
-        if (!ok) {
-            return;
-        }
-        button_container.append(tag_container);
-
-        var on_add = add_tag(cell, tag_container, on_remove);
-        if(cell.is_editable()){
-            add_tag_edit(div, cell, on_add, on_remove);
-        }
-    };
-
-    var register = function(notebook) {
-      CellToolbar.register_callback('tags.edit', add_tags_cellbar);
-
-      var tags_preset = [];
-      tags_preset.push('tags.edit');
-
-      CellToolbar.register_preset('Tags', tags_preset, notebook);
-
-    };
-    return {'register' : register};
-});
diff --git a/notebook/static/notebook/js/clipboard.js b/notebook/static/notebook/js/clipboard.js
deleted file mode 100644
index fe4bab90a..000000000
--- a/notebook/static/notebook/js/clipboard.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/dialog'
-], function($, Jupyter, utils, i18n, dialog) {
-
-var jcbprefix = '<pre class="jupyter-nb-cells-json">';
-var jcbsuffix = '</pre>';
-
-function store_json(cells, clipboard) {
-  // Firefox ignores application/json mime type, so put it in HTML as well.
-  // We also copy a text version so you can paste cell sources into a text editor
-  var j = JSON.stringify(cells);
-  var t = cells.map(function(c) {return c.source;}).join('\n\n');
-  clipboard.setData('text/plain', t);
-  clipboard.setData('text/html', jcbprefix + j + jcbsuffix);
-  clipboard.setData('application/json', j);
-}
-
-function load_json(clipboard) {
-  var s = clipboard.getData('text/html');
-  // System/browsers may add some more stuff before/after our content, so
-  // find where our prefix and suffix are.
-  var pix = s.indexOf(jcbprefix);
-  var six = s.lastIndexOf(jcbsuffix);
-  if (pix === -1 || six === -1) {
-    return null;
-  }
-  return JSON.parse(s.slice(pix + jcbprefix.length, six));
-}
-
-function isProgrammaticCopy(event) {
-  return (typeof(event.target.selectionStart) !== 'undefined'
-    && typeof(event.target.selectionEnd) !== 'undefined'
-    && ((event.target.selectionEnd - event.target.selectionStart) > 0));
-}
-
-function copy(event) {
-  if ((Jupyter.notebook.mode !== 'command') ||
-        // window.getSelection checks if text is selected, e.g. in output
-        !window.getSelection().isCollapsed ||
-        // Allow programmatic copy
-        isProgrammaticCopy(event)) {
-    return;
-  }
-  var selecn = Jupyter.notebook.get_selected_cells().map(
-    function(c) { return c.toJSON();});
-  store_json(selecn, event.clipboardData);
-  event.preventDefault();
-}
-
-function paste(event) {
-  if (Jupyter.notebook.mode !== 'command') {
-    return;
-  }
-  console.log(i18n.msg.sprintf(i18n.msg._('Clipboard types: %s'),event.clipboardData.types));
-  cells = load_json(event.clipboardData);
-  // console.log(cells);
-  // Does this JSON look like cells?
-  if (Array.isArray(cells) && (cells.length > 0) &&
-      cells[0].cell_type && cells[0].source) {
-    var first_inserted = null;
-    for (var i=0; i < cells.length; i++) {
-        var cell_data = cells[i];
-        var new_cell = Jupyter.notebook.insert_cell_above(cell_data.cell_type);
-        new_cell.fromJSON(cell_data);
-        if (first_inserted === null) {
-            first_inserted = new_cell;
-        }
-    }
-    first_inserted.focus_cell();
-  }
-  event.preventDefault();
-}
-
-function notebookOnlyEvent(callback) {
-    // Only call the callback to redirect the event if the notebook should be
-    // handling the events, at the discretion of the keyboard manager.
-    // If the focus is in a text widget or something (kbmanager disabled),
-    // allow the default event.
-    return function() {
-        if (Jupyter.keyboard_manager.enabled) {
-            callback.apply(this, arguments);
-        }
-    };
-}
-
-function needs_text_box_for_paste_event() {
-  // I know this is bad, but I don't know a better way to check this
-  return navigator.userAgent.indexOf('Firefox') !== -1;
-}
-
-function setup_paste_dialog() {
-  // Firefox only fires a paste event if the cursor is in a text input. So, on
-  // Ctrl-V, bring up a dialog with an invisible text box and catch the
-  // second Ctrl-V
-  var action = {
-      icon: 'fa-clipboard', // a font-awesome class used on buttons, etc
-      help    : i18n.msg._('Dialog for paste from system clipboard'),
-      help_index : 'zz',
-      handler : function () {
-        var entry_box = $('<input type="text"/>');
-        entry_box.css('opacity', 0);
-        function paste_close_dlg(e) {
-          paste(e);
-          // There must be a better way to do this, but it's not any of:
-          // .hide(), .remove() or .dialog('close')
-          paste_dlg.find('.close').click();
-          document.removeEventListener('paste', paste_close_dlg);
-        }
-        document.addEventListener('paste', paste_close_dlg);
-        var cmdtrl = i18n.msg._('Ctrl-V');
-        if (utils.platform === 'MacOS') {
-            cmdtrl = i18n.msg._('Cmd-V');
-        }
-        var dialog_body = $("<div/>").append("<p>").append(i18n.msg.sprintf(i18n.msg._("Press %s again to paste"),cmdtrl))
-            .append("<br/>")
-            .append("<p><b>")
-            .append(i18n.msg._("Why is this needed? "))
-            .append("</b>")
-            .append(i18n.msg._("We can't get paste events in this browser without a text box. "))
-            .append(i18n.msg._("There's an invisible text box focused in this dialog."))
-            .append($("<form/>").append(entry_box));
-
-        var paste_dlg = dialog.modal({
-            notebook: Jupyter.notebook,
-            keyboard_manager: Jupyter.keyboard_manager,
-            title : i18n.msg.sprintf(i18n.msg._("%s to paste"),cmdtrl),
-            body : dialog_body,
-            open: function() {
-                entry_box.focus();
-            },
-            buttons : {
-                "Cancel" : {
-                    // click : function() { reject("Dialog cancelled"); },
-                }
-            }
-        });
-      }
-  };
-  var full_action_name = Jupyter.actions.register(action, 'paste-dialog', 'system-clipboard');
-  Jupyter.keyboard_manager.command_shortcuts.add_shortcut('Cmdtrl-V', full_action_name);
-}
-
-// Set clipboard event listeners on the document.
-return {setup_clipboard_events: function() {
-  document.addEventListener('copy', notebookOnlyEvent(copy));
-  if (needs_text_box_for_paste_event()) {
-    setup_paste_dialog();
-  } else {
-    document.addEventListener('paste', notebookOnlyEvent(paste));
-  }
-}};
-});
diff --git a/notebook/static/notebook/js/codecell.js b/notebook/static/notebook/js/codecell.js
deleted file mode 100644
index a1b7179ec..000000000
--- a/notebook/static/notebook/js/codecell.js
+++ /dev/null
@@ -1,620 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-/**
- *
- *
- * @module codecell
- * @namespace codecell
- * @class CodeCell
- */
-
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/keyboard',
-    'services/config',
-    'notebook/js/cell',
-    'notebook/js/outputarea',
-    'notebook/js/completer',
-    'notebook/js/celltoolbar',
-    'codemirror/lib/codemirror',
-    'codemirror/mode/python/python',
-    'notebook/js/codemirror-ipython'
-], function(
-    $,
-    IPython,
-    utils,
-    i18n,
-    keyboard,
-    configmod,
-    cell,
-    outputarea,
-    completer,
-    celltoolbar,
-    CodeMirror,
-    cmpython,
-    cmip
-    ) {
-    "use strict";
-    
-    var Cell = cell.Cell;
-
-    /* local util for codemirror */
-    var posEq = function(a, b) {return a.line === b.line && a.ch === b.ch;};
-
-    /**
-     *
-     * function to delete until previous non blanking space character
-     * or first multiple of 4 tabstop.
-     * @private
-     */
-    CodeMirror.commands.delSpaceToPrevTabStop = function(cm){
-        var tabSize = cm.getOption('tabSize');
-        var ranges = cm.listSelections(); // handle multicursor
-        for (var i = ranges.length - 1; i >= 0; i--) { // iterate reverse so any deletions don't overlap
-            var head = ranges[i].head;
-            var anchor = ranges[i].anchor;
-            var sel = !posEq(head, anchor);
-            if (sel) {
-                // range is selection
-                cm.replaceRange("", anchor, head);
-            } else {
-                // range is cursor
-                var line = cm.getLine(head.line).substring(0, head.ch);
-                if (line.match(/^\ +$/) !== null){
-                    // delete tabs
-                    var prevTabStop = (Math.ceil(head.ch/tabSize)-1)*tabSize;
-                    var from = CodeMirror.Pos(head.line, prevTabStop)
-                    cm.replaceRange("", from, head);
-                } else {
-                    // delete normally
-                    var from = cm.findPosH(head, -1,  'char', false);
-                    cm.replaceRange("", from, head);
-                }
-            }
-        }
-    };
-
-    var keycodes = keyboard.keycodes;
-
-    var CodeCell = function (kernel, options) {
-        /**
-         * Constructor
-         *
-         * A Cell conceived to write code.
-         *
-         * Parameters:
-         *  kernel: Kernel instance
-         *      The kernel doesn't have to be set at creation time, in that case
-         *      it will be null and set_kernel has to be called later.
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance 
-         *          config: dictionary
-         *          keyboard_manager: KeyboardManager instance 
-         *          notebook: Notebook instance
-         *          tooltip: Tooltip instance
-         */
-        this.kernel = kernel || null;
-        this.notebook = options.notebook;
-        this.collapsed = false;
-        this.events = options.events;
-        this.tooltip = options.tooltip;
-        this.config = options.config;
-        this.class_config = new configmod.ConfigWithDefaults(this.config,
-                                        CodeCell.options_default, 'CodeCell');
-
-        // create all attributed in constructor function
-        // even if null for V8 VM optimisation
-        this.input_prompt_number = null;
-        this.celltoolbar = null;
-        this.output_area = null;
-
-        this.last_msg_id = null;
-        this.completer = null;
-
-        Cell.apply(this,[{
-            config: options.config, 
-            keyboard_manager: options.keyboard_manager, 
-            events: this.events}]);
-
-        // Attributes we want to override in this subclass.
-        this.cell_type = "code";
-        var that  = this;
-        this.element.focusout(
-            function() { that.auto_highlight(); }
-        );
-    };
-
-    CodeCell.options_default = {
-        cm_config : {
-            extraKeys: {
-                "Backspace" : "delSpaceToPrevTabStop",
-            },
-            mode: 'text',
-            theme: 'ipython',
-            matchBrackets: true,
-            autoCloseBrackets: true
-        },
-        highlight_modes : {
-            'magic_javascript'    :{'reg':['^%%javascript']},
-            'magic_perl'          :{'reg':['^%%perl']},
-            'magic_ruby'          :{'reg':['^%%ruby']},
-            'magic_python'        :{'reg':['^%%python3?']},
-            'magic_shell'         :{'reg':['^%%bash']},
-            'magic_r'             :{'reg':['^%%R']},
-            'magic_text/x-cython' :{'reg':['^%%cython']},
-        },
-    };
-
-    CodeCell.msg_cells = {};
-
-    CodeCell.prototype = Object.create(Cell.prototype);
-    
-    /** @method create_element */
-    CodeCell.prototype.create_element = function () {
-        Cell.prototype.create_element.apply(this, arguments);
-        var that = this;
-
-        var cell =  $('<div></div>').addClass('cell code_cell');
-        cell.attr('tabindex','2');
-
-        var input = $('<div></div>').addClass('input');
-        this.input = input;
-
-        var prompt_container = $('<div/>').addClass('prompt_container');
-
-        var run_this_cell = $('<div></div>').addClass('run_this_cell');
-        run_this_cell.prop('title', 'Run this cell');
-        run_this_cell.append('<i class="fa-step-forward fa"></i>');
-        run_this_cell.click(function (event) {
-            event.stopImmediatePropagation();
-            that.execute();
-        });
-
-        var prompt = $('<div/>').addClass('prompt input_prompt');
-        
-        var inner_cell = $('<div/>').addClass('inner_cell');
-        this.celltoolbar = new celltoolbar.CellToolbar({
-            cell: this, 
-            notebook: this.notebook});
-        inner_cell.append(this.celltoolbar.element);
-        var input_area = $('<div/>').addClass('input_area').attr("aria-label", i18n.msg._("Edit code here"));
-        this.code_mirror = new CodeMirror(input_area.get(0), this._options.cm_config);
-        // In case of bugs that put the keyboard manager into an inconsistent state,
-        // ensure KM is enabled when CodeMirror is focused:
-        this.code_mirror.on('focus', function () {
-            if (that.keyboard_manager) {
-                that.keyboard_manager.enable();
-            }
-
-            that.code_mirror.setOption('readOnly', !that.is_editable());
-        });
-        this.code_mirror.on('keydown', $.proxy(this.handle_keyevent,this));
-        $(this.code_mirror.getInputField()).attr("spellcheck", "false");
-        inner_cell.append(input_area);
-        prompt_container.append(prompt).append(run_this_cell);
-        input.append(prompt_container).append(inner_cell);
-
-        var output = $('<div></div>');
-        cell.append(input).append(output);
-        this.element = cell;
-        this.output_area = new outputarea.OutputArea({
-            config: this.config,
-            selector: output,
-            prompt_area: true,
-            events: this.events,
-            keyboard_manager: this.keyboard_manager,
-        });
-        this.completer = new completer.Completer(this, this.events);
-    };
-
-    /** @method bind_events */
-    CodeCell.prototype.bind_events = function () {
-        Cell.prototype.bind_events.apply(this, arguments);
-        var that = this;
-
-        this.element.focusout(
-            function() { that.auto_highlight(); }
-        );
-
-        this.events.on('kernel_restarting.Kernel', function() {
-            if (that.input_prompt_number === '*') {
-              that.set_input_prompt();
-            }
-        });
-    };
-
-
-    /**
-     *  This method gets called in CodeMirror's onKeyDown/onKeyPress
-     *  handlers and is used to provide custom key handling. Its return
-     *  value is used to determine if CodeMirror should ignore the event:
-     *  true = ignore, false = don't ignore.
-     *  @method handle_codemirror_keyevent
-     */
-
-    CodeCell.prototype.handle_codemirror_keyevent = function (editor, event) {
-
-        var that = this;
-        // whatever key is pressed, first, cancel the tooltip request before
-        // they are sent, and remove tooltip if any, except for tab again
-        var tooltip_closed = null;
-        if (event.type === 'keydown' && event.which !== keycodes.tab ) {
-            tooltip_closed = this.tooltip.remove_and_cancel_tooltip();
-        }
-
-        var cur = editor.getCursor();
-        if (event.keyCode === keycodes.enter){
-            this.auto_highlight();
-        }
-
-        if (event.which === keycodes.down && event.type === 'keypress' && this.tooltip.time_before_tooltip >= 0) {
-            // triger on keypress (!) otherwise inconsistent event.which depending on platform
-            // browser and keyboard layout !
-            // Pressing '(' , request tooltip, don't forget to reappend it
-            // The second argument says to hide the tooltip if the docstring
-            // is actually empty
-            this.tooltip.pending(that, true);
-        } else if ( tooltip_closed && event.which === keycodes.esc && event.type === 'keydown') {
-            // If tooltip is active, cancel it.  The call to
-            // remove_and_cancel_tooltip above doesn't pass, force=true.
-            // Because of this it won't actually close the tooltip
-            // if it is in sticky mode. Thus, we have to check again if it is open
-            // and close it with force=true.
-            if (!this.tooltip._hidden) {
-                this.tooltip.remove_and_cancel_tooltip(true);
-            }
-            // If we closed the tooltip, don't let CM or the global handlers
-            // handle this event.
-            event.codemirrorIgnore = true;
-            event._ipkmIgnore = true;
-            event.preventDefault();
-            return true;
-        } else if (event.keyCode === keycodes.tab && event.type === 'keydown' && event.shiftKey) {
-                if (editor.somethingSelected() || editor.getSelections().length !== 1){
-                    var anchor = editor.getCursor("anchor");
-                    var head = editor.getCursor("head");
-                    if( anchor.line !== head.line){
-                        return false;
-                    }
-                }
-                var pre_cursor = editor.getRange({line:cur.line,ch:0},cur);
-                if (pre_cursor.trim() === "") {
-                    // Don't show tooltip if the part of the line before the cursor
-                    // is empty.  In this case, let CodeMirror handle indentation.
-                    return false;
-                } 
-                this.tooltip.request(that);
-                event.codemirrorIgnore = true;
-                event.preventDefault();
-                return true;
-        } else if (event.keyCode === keycodes.tab && event.type === 'keydown') {
-            // Tab completion.
-            this.tooltip.remove_and_cancel_tooltip();
-
-            // completion does not work on multicursor, it might be possible though in some cases
-            if (editor.somethingSelected() || editor.getSelections().length > 1) {
-                return false;
-            }
-            var pre_cursor = editor.getRange({line:cur.line,ch:0},cur);
-            if (pre_cursor.trim() === "") {
-                // Don't autocomplete if the part of the line before the cursor
-                // is empty.  In this case, let CodeMirror handle indentation.
-                return false;
-            } else {
-                event.codemirrorIgnore = true;
-                event.preventDefault();
-                this.completer.startCompletion();
-                return true;
-            }
-        } 
-        
-        // keyboard event wasn't one of those unique to code cells, let's see
-        // if it's one of the generic ones (i.e. check edit mode shortcuts)
-        return Cell.prototype.handle_codemirror_keyevent.apply(this, [editor, event]);
-    };
-
-    // Kernel related calls.
-
-    CodeCell.prototype.set_kernel = function (kernel) {
-        this.kernel = kernel;
-    };
-
-    /**
-     * Execute current code cell to the kernel
-     * @method execute
-     */
-    CodeCell.prototype.execute = function (stop_on_error) {
-        if (!this.kernel) {
-            console.log(i18n.msg._("Can't execute cell since kernel is not set."));
-            return;
-        }
-
-        if (stop_on_error === undefined) {
-            if (this.metadata !== undefined && 
-                    this.metadata.tags !== undefined) {
-                if (this.metadata.tags.indexOf('raises-exception') !== -1) {
-                    stop_on_error = false;
-                } else {
-                    stop_on_error = true;
-                }
-            } else {
-               stop_on_error = true;
-            }
-        }
-
-        this.clear_output(false, true);
-        var old_msg_id = this.last_msg_id;
-        if (old_msg_id) {
-            this.kernel.clear_callbacks_for_msg(old_msg_id);
-            delete CodeCell.msg_cells[old_msg_id];
-            this.last_msg_id = null;
-        }
-        if (this.get_text().trim().length === 0) {
-            // nothing to do
-            this.set_input_prompt(null);
-            return;
-        }
-        this.set_input_prompt('*');
-        this.element.addClass("running");
-        var callbacks = this.get_callbacks();
-        
-        this.last_msg_id = this.kernel.execute(this.get_text(), callbacks, {silent: false, store_history: true,
-            stop_on_error : stop_on_error});
-        CodeCell.msg_cells[this.last_msg_id] = this;
-        this.render();
-        this.events.trigger('execute.CodeCell', {cell: this});
-        var that = this;
-        function handleFinished(evt, data) {
-            if (that.kernel.id === data.kernel.id && that.last_msg_id === data.msg_id) {
-                    that.events.trigger('finished_execute.CodeCell', {cell: that});
-                that.events.off('finished_iopub.Kernel', handleFinished);
-              }
-        }
-        this.events.on('finished_iopub.Kernel', handleFinished);
-    };
-    
-    /**
-     * Construct the default callbacks for
-     * @method get_callbacks
-     */
-    CodeCell.prototype.get_callbacks = function () {
-        var that = this;
-        return {
-            clear_on_done: false,
-            shell : {
-                reply : $.proxy(this._handle_execute_reply, this),
-                payload : {
-                    set_next_input : $.proxy(this._handle_set_next_input, this),
-                    page : $.proxy(this._open_with_pager, this)
-                }
-            },
-            iopub : {
-                output : function() { 
-                    that.events.trigger('set_dirty.Notebook', {value: true});
-                    that.output_area.handle_output.apply(that.output_area, arguments);
-                }, 
-                clear_output : function() { 
-                    that.events.trigger('set_dirty.Notebook', {value: true});
-                    that.output_area.handle_clear_output.apply(that.output_area, arguments);
-                }, 
-            },
-            input : $.proxy(this._handle_input_request, this),
-        };
-    };
-    
-    CodeCell.prototype._open_with_pager = function (payload) {
-        this.events.trigger('open_with_text.Pager', payload);
-    };
-
-    /**
-     * @method _handle_execute_reply
-     * @private
-     */
-    CodeCell.prototype._handle_execute_reply = function (msg) {
-        this.set_input_prompt(msg.content.execution_count);
-        this.element.removeClass("running");
-        this.events.trigger('set_dirty.Notebook', {value: true});
-    };
-
-    /**
-     * @method _handle_set_next_input
-     * @private
-     */
-    CodeCell.prototype._handle_set_next_input = function (payload) {
-        var data = {
-            cell: this,
-            text: payload.text,
-            replace: payload.replace,
-            clear_output: payload.clear_output,
-        };
-        this.events.trigger('set_next_input.Notebook', data);
-    };
-
-    /**
-     * @method _handle_input_request
-     * @private
-     */
-    CodeCell.prototype._handle_input_request = function (msg) {
-        this.output_area.append_raw_input(msg);
-    };
-
-
-    // Basic cell manipulation.
-
-    CodeCell.prototype.select = function () {
-        var cont = Cell.prototype.select.apply(this, arguments);
-        if (cont) {
-            this.code_mirror.refresh();
-            this.auto_highlight();
-        }
-        return cont;
-    };
-
-    CodeCell.prototype.render = function () {
-        var cont = Cell.prototype.render.apply(this, arguments);
-        // Always execute, even if we are already in the rendered state
-        return cont;
-    };
-    
-    CodeCell.prototype.select_all = function () {
-        var start = {line: 0, ch: 0};
-        var nlines = this.code_mirror.lineCount();
-        var last_line = this.code_mirror.getLine(nlines-1);
-        var end = {line: nlines-1, ch: last_line.length};
-        this.code_mirror.setSelection(start, end);
-    };
-
-
-    CodeCell.prototype.collapse_output = function () {
-        this.output_area.collapse();
-    };
-
-
-    CodeCell.prototype.expand_output = function () {
-        this.output_area.expand();
-        this.output_area.unscroll_area();
-    };
-
-    CodeCell.prototype.scroll_output = function () {
-        this.output_area.expand();
-        this.output_area.scroll_if_long();
-    };
-
-    CodeCell.prototype.toggle_output = function () {
-        this.output_area.toggle_output();
-    };
-
-    CodeCell.prototype.toggle_output_scroll = function () {
-        this.output_area.toggle_scroll();
-    };
-
-
-    CodeCell.input_prompt_classical = function (prompt_value, lines_number) {
-        var ns;
-        if (prompt_value === undefined || prompt_value === null) {
-            ns = "&nbsp;";
-        } else {
-            ns = encodeURIComponent(prompt_value);
-        }
-        return '<bdi>'+i18n.msg._('In')+'</bdi>&nbsp;[' + ns + ']:';
-    };
-
-    CodeCell.input_prompt_continuation = function (prompt_value, lines_number) {
-        var html = [CodeCell.input_prompt_classical(prompt_value, lines_number)];
-        for(var i=1; i < lines_number; i++) {
-            html.push(['...:']);
-        }
-        return html.join('<br/>');
-    };
-
-    CodeCell.input_prompt_function = CodeCell.input_prompt_classical;
-
-
-    CodeCell.prototype.set_input_prompt = function (number) {
-        var nline = 1;
-        if (this.code_mirror !== undefined) {
-           nline = this.code_mirror.lineCount();
-        }
-        this.input_prompt_number = number;
-        var prompt_html = CodeCell.input_prompt_function(this.input_prompt_number, nline);
-
-        // This HTML call is okay because the user contents are escaped.
-        this.element.find('div.input_prompt').html(prompt_html);
-        this.events.trigger('set_dirty.Notebook', {value: true});
-    };
-
-
-    CodeCell.prototype.clear_input = function () {
-        this.code_mirror.setValue('');
-    };
-
-
-    CodeCell.prototype.get_text = function () {
-        return this.code_mirror.getValue();
-    };
-
-
-    CodeCell.prototype.set_text = function (code) {
-        return this.code_mirror.setValue(code);
-    };
-
-
-    CodeCell.prototype.clear_output = function (wait, ignore_queue) {
-        this.events.trigger('clear_output.CodeCell', {cell: this});
-        this.output_area.clear_output(wait, ignore_queue);
-        this.set_input_prompt();
-    };
-
-
-    // JSON serialization
-
-    CodeCell.prototype.fromJSON = function (data) {
-        Cell.prototype.fromJSON.apply(this, arguments);
-        if (data.cell_type === 'code') {
-            if (data.source !== undefined) {
-                this.set_text(data.source);
-                // make this value the starting point, so that we can only undo
-                // to this state, instead of a blank cell
-                this.code_mirror.clearHistory();
-                this.auto_highlight();
-            }
-            this.set_input_prompt(data.execution_count);
-            this.output_area.trusted = data.metadata.trusted || false;
-            this.output_area.fromJSON(data.outputs, data.metadata);
-        }
-    };
-
-
-    CodeCell.prototype.toJSON = function () {
-        var data = Cell.prototype.toJSON.apply(this);
-        data.source = this.get_text();
-        // is finite protect against undefined and '*' value
-        if (isFinite(this.input_prompt_number)) {
-            data.execution_count = this.input_prompt_number;
-        } else {
-            data.execution_count = null;
-        }
-        var outputs = this.output_area.toJSON();
-        data.outputs = outputs;
-        data.metadata.trusted = this.output_area.trusted;
-        if (this.output_area.collapsed) {
-            data.metadata.collapsed = this.output_area.collapsed;
-        } else {
-            delete data.metadata.collapsed;
-        }
-        if (this.output_area.scroll_state === 'auto') {
-            delete data.metadata.scrolled;
-        } else {
-            data.metadata.scrolled = this.output_area.scroll_state;
-        }
-        return data;
-    };
-
-    /**
-     * handle cell level logic when the cell is unselected
-     * @method unselect
-     * @return is the action being taken
-     */
-    CodeCell.prototype.unselect = function() {
-        var cont = Cell.prototype.unselect.apply(this, arguments);
-        if (cont) {
-            // When a code cell is unselected, make sure that the corresponding
-            // tooltip and completer to that cell is closed.
-            this.tooltip.remove_and_cancel_tooltip(true);
-            if (this.completer !== null) {
-                this.completer.close();
-            }
-        }
-        return cont;
-    };
-
-    // Backwards compatibility.
-    IPython.CodeCell = CodeCell;
-
-    return {'CodeCell': CodeCell};
-});
diff --git a/notebook/static/notebook/js/codemirror-ipython.js b/notebook/static/notebook/js/codemirror-ipython.js
deleted file mode 100644
index 4b05d3636..000000000
--- a/notebook/static/notebook/js/codemirror-ipython.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// IPython mode is just a slightly altered Python Mode with `?` beeing a extra
-// single operator. Here we define `ipython` mode in the require `python`
-// callback to auto-load python mode, which is more likely not the best things
-// to do, but at least the simple one for now.
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object"){ // CommonJS
-    mod(requirejs("codemirror/lib/codemirror"),
-        requirejs("codemirror/mode/python/python")
-        );
-  } else if (typeof define == "function" && define.amd){ // AMD
-    define(["codemirror/lib/codemirror",
-            "codemirror/mode/python/python"], mod);
-  } else {// Plain browser env
-    mod(CodeMirror);
-  }
-})(function(CodeMirror) {
-    "use strict";
-
-    CodeMirror.defineMode("ipython", function(conf, parserConf) {
-        var pythonConf = {};
-        for (var prop in parserConf) {
-            if (parserConf.hasOwnProperty(prop)) {
-                pythonConf[prop] = parserConf[prop];
-            }
-        }
-        pythonConf.name = 'python';
-        pythonConf.singleOperators = new RegExp("^[\\+\\-\\*/%&|@\\^~<>!\\?]");
-        if (pythonConf.version === 3) {
-            pythonConf.identifiers = new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
-        } else if (pythonConf.version === 2) {
-            pythonConf.identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
-        }
-        return CodeMirror.getMode(conf, pythonConf);
-    }, 'python');
-
-    CodeMirror.defineMIME("text/x-ipython", "ipython");
-})
diff --git a/notebook/static/notebook/js/codemirror-ipythongfm.js b/notebook/static/notebook/js/codemirror-ipythongfm.js
deleted file mode 100644
index e167c8005..000000000
--- a/notebook/static/notebook/js/codemirror-ipythongfm.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// IPython GFM (GitHub Flavored Markdown) mode is just a slightly altered GFM
-// Mode with support for latex.
-//
-// Latex support was supported by Codemirror GFM as of
-//   https://github.com/codemirror/CodeMirror/pull/567
-// But was later removed in
-//   https://github.com/codemirror/CodeMirror/commit/d9c9f1b1ffe984aee41307f3e927f80d1f23590c
-
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object"){ // CommonJS
-    mod(requirejs("codemirror/lib/codemirror")
-        ,requirejs("codemirror/addon/mode/multiplex")
-        ,requirejs("codemirror/mode/gfm/gfm")
-        ,requirejs("codemirror/mode/stex/stex")
-        );
-  } else if (typeof define == "function" && define.amd){ // AMD
-    define(["codemirror/lib/codemirror"
-            ,"codemirror/addon/mode/multiplex"
-            ,"codemirror/mode/python/python"
-            ,"codemirror/mode/stex/stex"
-            ], mod);
-  } else {// Plain browser env
-    mod(CodeMirror);
-  }
-})( function(CodeMirror){
-    "use strict";
-
-    CodeMirror.defineMode("ipythongfm", function(config, parserConfig) {
-
-        var gfm_mode = CodeMirror.getMode(config, "gfm");
-        var tex_mode = CodeMirror.getMode(config, "stex");
-
-        return CodeMirror.multiplexingMode(
-            gfm_mode,
-            // By defining the $$ delimiter before the $ delimiter we don't run
-            // into the problem that $$ is interpreted as two consecutive $.
-            {
-                open: "$$", close: "$$",
-                mode: tex_mode,
-                delimStyle: "delimit"
-            },
-            {
-                open: "$", close: "$",
-                mode: tex_mode,
-                delimStyle: "delimit"
-            },
-            {
-                open: "\\(", close: "\\)",
-                mode: tex_mode,
-                delimStyle: "delimit"
-            },
-            {
-                open: "\\[", close: "\\]",
-                mode: tex_mode,
-                delimStyle: "delimit"
-            }
-            // .. more multiplexed styles can follow here
-        );
-    }, 'gfm');
-
-    CodeMirror.defineMIME("text/x-ipythongfm", "ipythongfm");
-})
diff --git a/notebook/static/notebook/js/commandpalette.js b/notebook/static/notebook/js/commandpalette.js
deleted file mode 100644
index cf1bd6912..000000000
--- a/notebook/static/notebook/js/commandpalette.js
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'typeahead',
-    'base/js/i18n',
-    'notebook/js/quickhelp'
-],function($, typeahead, i18n, QH){
-    "use strict";
-
-    /**
-     * Humanize the action name to be consumed by user.
-     * internally the actions anem are of the form
-     * <namespace>:<description-with-dashes>
-     * we drop <namespace> and replace dashes for space.
-     */
-    var humanize_action_id = function(str) {
-      return str.split(':')[1].replace(/-/g, ' ').replace(/_/g, '-');
-    };
-
-    /**
-     * given an action id return 'command-shortcut', 'edit-shortcut' or 'no-shortcut'
-     * for the action. This allows us to tag UI in order to visually distinguish
-     * wether an action have a keybinding or not.
-     **/
-    var get_mode_for_action_id = function(name, notebook) {
-      var shortcut = notebook.keyboard_manager.command_shortcuts.get_action_shortcut(name);
-      if (shortcut) {
-        return 'command-shortcut';
-      }
-      shortcut = notebook.keyboard_manager.edit_shortcuts.get_action_shortcut(name);
-      if (shortcut) {
-        return 'edit-shortcut';
-      }
-      return 'no-shortcut';
-    };
-
-    var CommandPalette = function(notebook) {
-        if(!notebook){
-          throw new Error("CommandPalette takes a notebook non-null mandatory argument");
-        }
-
-        // typeahead lib need a specific layout with specific class names.
-        // the following just does that
-        var form = $('<form/>');
-        var container = $('<div/>').addClass('typeahead__container');
-        var field = $('<div/>').addClass('typeahead__field');
-        var input = $('<input/>').attr('type', 'search');
-
-        field
-          .append(
-            $('<span>').addClass('typeahead__query').append(
-              input
-            )
-          )
-          .append(
-            $('<span/>').addClass('typeahead__button').append(
-              $('<button/>').attr('type', 'submit').append(
-                $('<span/>').addClass('typeahead__search-icon')
-              )
-            )
-          );
-
-        container.append(field);
-        form.append(container);
-
-
-        var mod = $('<div/>').addClass('modal cmd-palette').append(
-          $('<div/>').addClass('modal-dialog')
-          .append(
-            $('<div/>').addClass('modal-content').append(
-              $('<div/>').addClass('modal-body')
-              .append(
-                form
-              )
-            )
-          )
-        )
-        // end setting up right layout
-        .modal({show: false, backdrop:true})
-        .on('shown.bs.modal', function () {
-              // click on button trigger de-focus on mouse up.
-              // or something like that.
-              setTimeout(function(){input.focus();}, 100);
-        });
-
-        notebook.keyboard_manager.disable();
-
-        var before_close = function() {
-          // little trick to trigger early in onsubmit
-          // when the action called pop-up a dialog
-          // insure this function is only called once
-          if (before_close.ok) {
-            return;
-          }
-          var cell = notebook.get_selected_cell();
-          if (cell) {
-            cell.select();
-          }
-          if (notebook.keyboard_manager) {
-            notebook.keyboard_manager.enable();
-            notebook.keyboard_manager.command_mode();
-          }
-          before_close.ok = true; // avoid double call.
-        };
-        
-        mod.on("hide.bs.modal", before_close);
-        
-
-        // will be trigger when user select action
-        var onSubmit = function(node, query, result, resultCount) {
-          if (actions.indexOf(result.key) >= 0) {
-            before_close();
-            notebook.keyboard_manager.actions.call(result.key);
-          } else {
-            console.warning("No command " + result.key);
-          }
-          mod.modal('hide');
-        };
-
-        /* Whenever a result is rendered, if there is only one resulting
-         * element then automatically select that element.
-         */
-        var onResult = function(node, query, result, resultCount) {
-            if (resultCount == 1) {
-                requestAnimationFrame(function() {
-                    $('.typeahead-list > li:nth-child(2)').addClass('active');
-                });
-            }
-        };
-
-        // generate structure needed for typeahead layout and ability to search
-        var src = {};
-
-        var actions = Object.keys(notebook.keyboard_manager.actions._actions);
-
-        for (var i = 0; i < actions.length; i++) {
-          var action_id = actions[i];
-          var action = notebook.keyboard_manager.actions.get(action_id);
-          var group = action_id.split(':')[0];
-
-          src[group] = src[group] || {
-            data: [],
-            display: 'display'
-          };
-
-          var short = notebook.keyboard_manager.command_shortcuts.get_action_shortcut(action_id) ||
-            notebook.keyboard_manager.edit_shortcuts.get_action_shortcut(action_id);
-          if (short) {
-            short = QH.humanize_sequence(short);
-          }
-
-          var display_text;
-          if (action.cmd) {
-              display_text = i18n.msg._(action.cmd);
-          } else {
-              display_text = humanize_action_id(action_id);
-          }
-
-          var help = null;
-          if (action.help) {
-              help = i18n.msg._(action.help);
-          }
-          
-          src[group].data.push({
-            display: display_text,
-            shortcut: short,
-            mode_shortcut: get_mode_for_action_id(action_id, notebook),
-            group: group,
-            icon: action.icon,
-            help: help,
-            key: action_id,
-          });
-        }
-
-        // now src is the right structure for typeahead
-
-        input.typeahead({
-          emptyTemplate: function(query) {
-            return $('<div>').text("No results found for ").append(
-                $('<code>').text(query)
-            );
-          },
-          maxItem: 1e3,
-          minLength: 0,
-          hint: true,
-          group: {
-            template:"{{group}} command group"
-          },
-          searchOnFocus: true,
-          mustSelectItem: true,
-          template: '<i class="fa fa-icon {{icon}}"></i>{{display}}  <div title={{key}} class="pull-right {{mode_shortcut}}">{{shortcut}}</div>',
-          order: "asc",
-          source: src,
-          callback: {
-            onSubmit: onSubmit,
-            onClickAfter: onSubmit,
-            onResult: onResult
-          },
-          debug: false,
-        });
-
-        mod.modal('show');
-    };
-    return {'CommandPalette': CommandPalette};
-});
diff --git a/notebook/static/notebook/js/completer.js b/notebook/static/notebook/js/completer.js
deleted file mode 100644
index 98b89161c..000000000
--- a/notebook/static/notebook/js/completer.js
+++ /dev/null
@@ -1,421 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/keyboard',
-    'notebook/js/contexthint',
-    'codemirror/lib/codemirror',
-], function($, utils, keyboard, CodeMirror) {
-    "use strict";
-
-    // easier key mapping
-    var keycodes = keyboard.keycodes;
-
-    var prepend_n_prc = function(str, n) {
-        for( var i =0 ; i< n ; i++){
-            str = '%'+str ;
-        }
-        return str;
-    };
-
-    var _existing_completion = function(item, completion_array){
-        for( var i=0; i < completion_array.length; i++) {
-            if (completion_array[i].trim().substr(-item.length) == item) {
-                return true;
-            }
-        }
-        return false;
-    };
-
-    // what is the common start of all completions
-    function shared_start(B, drop_prct) {
-        if (B.length == 1) {
-            return B[0];
-        }
-        var A = [];
-        var common;
-        var min_lead_prct = 10;
-        for (var i = 0; i < B.length; i++) {
-            var str = B[i].str;
-            var localmin = 0;
-            if(drop_prct === true){
-                while ( str.substr(0, 1) == '%') {
-                    localmin = localmin+1;
-                    str = str.substring(1);
-                }
-            }
-            min_lead_prct = Math.min(min_lead_prct, localmin);
-            A.push(str);
-        }
-
-        if (A.length > 1) {
-            var tem1, tem2, s;
-            A = A.slice(0).sort();
-            tem1 = A[0];
-            s = tem1.length;
-            tem2 = A.pop();
-            while (s && tem2.indexOf(tem1) == -1) {
-                tem1 = tem1.substring(0, --s);
-            }
-            if (tem1 === "" || tem2.indexOf(tem1) !== 0) {
-                return {
-                    str:prepend_n_prc('', min_lead_prct),
-                    type: "computed",
-                    from: B[0].from,
-                    to: B[0].to
-                    };
-            }
-            return {
-                str: prepend_n_prc(tem1, min_lead_prct),
-                type: "computed",
-                from: B[0].from,
-                to: B[0].to
-            };
-        }
-        return null;
-    }
-
-
-    var Completer = function (cell, events) {
-        this.cell = cell;
-        this.editor = cell.code_mirror;
-        var that = this;
-        events.on('kernel_busy.Kernel', function () {
-            that.skip_kernel_completion = true;
-        });
-        events.on('kernel_idle.Kernel', function () {
-            that.skip_kernel_completion = false;
-        });
-    };
-
-    Completer.prototype.startCompletion = function () {
-        /**
-         * call for a 'first' completion, that will set the editor and do some
-         * special behavior like autopicking if only one completion available.
-         */
-        if (this.editor.somethingSelected()|| this.editor.getSelections().length > 1) return;
-        this.done = false;
-        // use to get focus back on opera
-        this.carry_on_completion(true);
-    };
-
-
-    // easy access for julia to monkeypatch
-    //
-    Completer.reinvoke_re = /[%0-9a-z._/\\:~-]/i;
-
-    Completer.prototype.reinvoke= function(pre_cursor, block, cursor){
-        return Completer.reinvoke_re.test(pre_cursor);
-    };
-
-    /**
-     *
-     * pass true as parameter if this is the first invocation of the completer
-     * this will prevent the completer to dismiss itself if it is not on a
-     * word boundary like pressing tab after a space, and make it autopick the
-     * only choice if there is only one which prevent from popping the UI.  as
-     * well as fast-forwarding the typing if all completion have a common
-     * shared start
-     **/
-    Completer.prototype.carry_on_completion = function (first_invocation) {
-        /**
-         * Pass true as parameter if you want the completer to autopick when
-         * only one completion. This function is automatically reinvoked at
-         * each keystroke with first_invocation = false
-         */
-        var cur = this.editor.getCursor();
-        var line = this.editor.getLine(cur.line);
-        var pre_cursor = this.editor.getRange({
-            line: cur.line,
-            ch: cur.ch - 1
-        }, cur);
-
-        // we need to check that we are still on a word boundary
-        // because while typing the completer is still reinvoking itself
-        // so dismiss if we are on a "bad" character
-        if (!this.reinvoke(pre_cursor) && !first_invocation) {
-            this.close();
-            return;
-        }
-
-        this.autopick = false;
-        if (first_invocation) {
-            this.autopick = true;
-        }
-
-        // We want a single cursor position.
-        if (this.editor.somethingSelected()|| this.editor.getSelections().length > 1) {
-            return;
-        }
-
-        // one kernel completion came back, finish_completing will be called with the results
-        // we fork here and directly call finish completing if kernel is busy
-        var cursor_pos = this.editor.indexFromPos(cur);
-        var text = this.editor.getValue();
-        cursor_pos = utils.js_idx_to_char_idx(cursor_pos, text);
-        if (this.skip_kernel_completion) {
-            this.finish_completing({ content: {
-                matches: [],
-                cursor_start: cursor_pos,
-                cursor_end: cursor_pos,
-            }});
-        } else {
-            this.cell.kernel.complete(text, cursor_pos,
-                $.proxy(this.finish_completing, this)
-            );
-        }
-    };
-
-    Completer.prototype.finish_completing = function (msg) {
-        /**
-         * let's build a function that wrap all that stuff into what is needed
-         * for the new completer:
-         */
-        var content = msg.content;
-        var start = content.cursor_start;
-        var end = content.cursor_end;
-        var matches = content.matches;
-        console.log(content);
-
-        var cur = this.editor.getCursor();
-        if (end === null) {
-            // adapted message spec replies don't have cursor position info,
-            // interpret end=null as current position,
-            // and negative start relative to that
-            end = this.editor.indexFromPos(cur);
-            if (start === null) {
-                start = end;
-            } else if (start < 0) {
-                start = end + start;
-            }
-        } else {
-            // handle surrogate pairs
-            var text = this.editor.getValue();
-            end = utils.char_idx_to_js_idx(end, text);
-            start = utils.char_idx_to_js_idx(start, text);
-        }
-
-        var results = CodeMirror.contextHint(this.editor);
-        var filtered_results = [];
-        //remove results from context completion
-        //that are already in kernel completion
-        var i;
-        for (i=0; i < results.length; i++) {
-            if (!_existing_completion(results[i].str, matches)) {
-                filtered_results.push(results[i]);
-            }
-        }
-
-        // append the introspection result, in order, at at the beginning of
-        // the table and compute the replacement range from current cursor
-        // position and matched_text length.
-        var from = this.editor.posFromIndex(start);
-        var to = this.editor.posFromIndex(end);
-        for (i = matches.length - 1; i >= 0; --i) {
-            filtered_results.unshift({
-                str: matches[i],
-                type: "introspection",
-                from: from,
-                to: to
-            });
-        }
-
-        // one the 2 sources results have been merge, deal with it
-        this.raw_result = filtered_results;
-
-        // if empty result return
-        if (!this.raw_result || !this.raw_result.length) return;
-
-        // When there is only one completion, use it directly.
-        if (this.autopick && this.raw_result.length == 1) {
-            this.insert(this.raw_result[0]);
-            return;
-        }
-
-        if (this.raw_result.length == 1) {
-            // test if first and only completion totally matches
-            // what is typed, in this case dismiss
-            var str = this.raw_result[0].str;
-            var pre_cursor = this.editor.getRange({
-                line: cur.line,
-                ch: cur.ch - str.length
-            }, cur);
-            if (pre_cursor == str) {
-                this.close();
-                return;
-            }
-        }
-
-        if (!this.visible) {
-            this.complete = $('<div/>').addClass('completions');
-            this.complete.attr('id', 'complete');
-
-            // Currently webkit doesn't use the size attr correctly. See:
-            // https://code.google.com/p/chromium/issues/detail?id=4579
-            this.sel = $('<select/>')
-                .attr('tabindex', -1)
-                .attr('multiple', 'true');
-            this.complete.append(this.sel);
-            this.visible = true;
-            $('body').append(this.complete);
-
-            //build the container
-            var that = this;
-            this.sel.click(function () {
-                that.pick();
-                that.editor.focus();
-            });
-            this._handle_keydown = function (cm, event) {
-                that.keydown(event);
-            };
-            this.editor.on('keydown', this._handle_keydown);
-            this._handle_keypress = function (cm, event) {
-                that.keypress(event);
-            };
-            this.editor.on('keypress', this._handle_keypress);
-        }
-        this.sel.attr('size', Math.min(10, this.raw_result.length));
-
-        // After everything is on the page, compute the position.
-        // We put it above the code if it is too close to the bottom of the page.
-        var pos = this.editor.cursorCoords(
-            this.editor.posFromIndex(start)
-        );
-        var left = pos.left-3;
-        var top;
-        var cheight = this.complete.height();
-        var wheight = $(window).height();
-        if (pos.bottom+cheight+5 > wheight) {
-            top = pos.top-cheight-4;
-        } else {
-            top = pos.bottom+1;
-        }
-        this.complete.css('left', left + 'px');
-        this.complete.css('top', top + 'px');
-
-        // Clear and fill the list.
-        this.sel.text('');
-        this.build_gui_list(this.raw_result);
-        return true;
-    };
-
-    Completer.prototype.insert = function (completion) {
-        this.editor.replaceRange(completion.str, completion.from, completion.to);
-    };
-
-    Completer.prototype.build_gui_list = function (completions) {
-        var MAXIMUM_GUI_LIST_LENGTH = 1000;
-        for (var i = 0; i < completions.length && i < MAXIMUM_GUI_LIST_LENGTH; ++i) {
-            var opt = $('<option/>').text(completions[i].str).addClass(completions[i].type);
-            this.sel.append(opt);
-        }
-        this.sel.children().first().attr('selected', 'true');
-        this.sel.scrollTop(0);
-    };
-
-    Completer.prototype.close = function () {
-        this.done = true;
-        $('#complete').remove();
-        this.editor.off('keydown', this._handle_keydown);
-        this.editor.off('keypress', this._handle_keypress);
-        this.visible = false;
-    };
-
-    Completer.prototype.pick = function () {
-        this.insert(this.raw_result[this.sel[0].selectedIndex]);
-        this.close();
-    };
-
-    Completer.prototype.keydown = function (event) {
-        var code = event.keyCode;
-
-        // Enter
-        var options;
-        var index;
-        if (code == keycodes.enter) {
-            event.codemirrorIgnore = true;
-            event._ipkmIgnore = true;
-            event.preventDefault();
-            this.pick();
-        // Escape or backspace
-        } else if (code == keycodes.esc || code == keycodes.backspace) {
-            event.codemirrorIgnore = true;
-            event._ipkmIgnore = true;
-            event.preventDefault();
-            this.close();
-        } else if (code == keycodes.tab) {
-            //all the fastforwarding operation,
-            //Check that shared start is not null which can append with prefixed completion
-            // like %pylab , pylab have no shared start, and ff will result in py<tab><tab>
-            // to erase py
-            var sh = shared_start(this.raw_result, true);
-            if (sh.str !== '') {
-                this.insert(sh);
-            }
-            this.close();
-            this.carry_on_completion();
-        } else if (code == keycodes.up || code == keycodes.down) {
-            // need to do that to be able to move the arrow
-            // when on the first or last line of a code cell
-            event.codemirrorIgnore = true;
-            event._ipkmIgnore = true;
-            event.preventDefault();
-
-            options = this.sel.find('option');
-            index = this.sel[0].selectedIndex;
-            if (code == keycodes.up) {
-                index--;
-            }
-            if (code == keycodes.down) {
-                index++;
-            }
-            index = Math.min(Math.max(index, 0), options.length-1);
-            this.sel[0].selectedIndex = index;
-        } else if (code == keycodes.pageup || code == keycodes.pagedown) {
-            event.codemirrorIgnore = true;
-            event._ipkmIgnore = true;
-
-            options = this.sel.find('option');
-            index = this.sel[0].selectedIndex;
-            if (code == keycodes.pageup) {
-                index -= 10; // As 10 is the hard coded size of the drop down menu
-            } else {
-                index += 10;
-            }
-            index = Math.min(Math.max(index, 0), options.length-1);
-            this.sel[0].selectedIndex = index;
-        } else if (code == keycodes.left || code == keycodes.right) {
-            this.close();
-        }
-    };
-
-    Completer.prototype.keypress = function (event) {
-        /**
-         * FIXME: This is a band-aid.
-         * on keypress, trigger insertion of a single character.
-         * This simulates the old behavior of completion as you type,
-         * before events were disconnected and CodeMirror stopped
-         * receiving events while the completer is focused.
-         */
-        
-        var that = this;
-        var code = event.keyCode;
-        
-        // don't handle keypress if it's not a character (arrows on FF)
-        // or ENTER/TAB
-        if (event.charCode === 0 ||
-            code == keycodes.tab ||
-            code == keycodes.enter
-        ) return;
-        
-        this.close();
-        this.editor.focus();
-        setTimeout(function () {
-            that.carry_on_completion();
-        }, 50);
-    };
-
-    return {'Completer': Completer};
-});
diff --git a/notebook/static/notebook/js/contexthint.js b/notebook/static/notebook/js/contexthint.js
deleted file mode 100644
index 4a425d4da..000000000
--- a/notebook/static/notebook/js/contexthint.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-// highly adapted for codemiror jshint
-define(['codemirror/lib/codemirror'], function(CodeMirror) {
-    "use strict";
-
-    var forEach = function(arr, f) {
-        for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
-    };
-
-    var arrayContains = function(arr, item) {
-        if (!Array.prototype.indexOf) {
-            var i = arr.length;
-            while (i--) {
-                if (arr[i] === item) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        return arr.indexOf(item) != -1;
-    };
-
-    CodeMirror.contextHint = function (editor) {
-        // Find the token at the cursor
-        var cur = editor.getCursor(),
-            token = editor.getTokenAt(cur),
-            tprop = token;
-        // If it's not a 'word-style' token, ignore the token.
-        // If it is a property, find out what it is a property of.
-        var list = [];
-        var clist = getCompletions(token, editor);
-        for (var i = 0; i < clist.length; i++) {
-            list.push({
-                str: clist[i],
-                type: "context",
-                from: {
-                    line: cur.line,
-                    ch: token.start
-                },
-                to: {
-                    line: cur.line,
-                    ch: token.end
-                }
-            });
-        }
-        return list;
-    };
-
-    // find all 'words' of current cell
-    var getAllTokens = function (editor) {
-        var found = [];
-
-        // add to found if not already in it
-
-
-        function maybeAdd(str) {
-            if (!arrayContains(found, str)) found.push(str);
-        }
-
-        // loop through all token on all lines
-        var lineCount = editor.lineCount();
-        // loop on line
-        for (var l = 0; l < lineCount; l++) {
-            var line = editor.getLine(l);
-            //loop on char
-            for (var c = 1; c < line.length; c++) {
-                var tk = editor.getTokenAt({
-                    line: l,
-                    ch: c
-                });
-                // if token has a class, it has geat chances of beeing
-                // of interest. Add it to the list of possible completions.
-                // we could skip token of ClassName 'comment'
-                // or 'number' and 'operator'
-                if (tk.className !== null) {
-                    maybeAdd(tk.string);
-                }
-                // jump to char after end of current token
-                c = tk.end;
-            }
-        }
-        return found;
-    };
-
-    var getCompletions = function(token, editor) {
-        var candidates = getAllTokens(editor);
-        // filter all token that have a common start (but nox exactly) the length of the current token
-        var lambda = function (x) {
-                return (x.indexOf(token.string) === 0 && x != token.string);
-            };
-        var filterd = candidates.filter(lambda);
-        return filterd;
-    };
-
-    return {'contextHint': CodeMirror.contextHint};
-});
diff --git a/notebook/static/notebook/js/kernelselector.js b/notebook/static/notebook/js/kernelselector.js
deleted file mode 100644
index 58f71d323..000000000
--- a/notebook/static/notebook/js/kernelselector.js
+++ /dev/null
@@ -1,352 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'base/js/dialog',
-    'base/js/utils',
-    'base/js/i18n'
-], function($, IPython, dialog, utils, i18n) {
-    "use strict";
-    
-    var KernelSelector = function(selector, notebook) {
-        var that = this;
-        this.selector = selector;
-        this.notebook = notebook;
-        this.notebook.set_kernelselector(this);
-        this.events = notebook.events;
-        this.current_selection = null;
-        this.kernelspecs = {};
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.request_kernelspecs();
-        }
-        this.bind_events();
-        // Make the object globally available for user convenience & inspection
-        IPython.kernelselector = this;
-        this._finish_load = null;
-        this._loaded = false;
-        this.loaded = new Promise(function(resolve) {
-            that._finish_load = resolve;
-        });
-        
-        Object.seal(this);
-    };
-    
-    KernelSelector.prototype.request_kernelspecs = function() {
-        // Preliminary documentation for kernelspecs api is at 
-        // https://github.com/ipython/ipython/wiki/IPEP-25%3A-Registry-of-installed-kernels#rest-api
-        var url = utils.url_path_join(this.notebook.base_url, 'api/kernelspecs');
-        utils.promising_ajax(url).then($.proxy(this._got_kernelspecs, this));
-    };
-    
-    var _sorted_names = function(kernelspecs) {
-        // sort kernel names
-        return Object.keys(kernelspecs).sort(function (a, b) {
-            // sort by display_name
-            var da = kernelspecs[a].spec.display_name;
-            var db = kernelspecs[b].spec.display_name;
-            if (da === db) {
-                return 0;
-            } else if (da > db) {
-                return 1;
-            } else {
-                return -1;
-            }
-        });
-    };
-    
-    KernelSelector.prototype._got_kernelspecs = function(data) {
-        var that = this;
-        this.kernelspecs = data.kernelspecs;
-        var change_kernel_submenu = $("#menu-change-kernel-submenu");
-        var new_notebook_submenu = $("#menu-new-notebook-submenu");
-        var keys = _sorted_names(data.kernelspecs);
-        
-        keys.map(function (key) {
-            // Create the Kernel > Change kernel submenu
-            var ks = data.kernelspecs[key];
-            change_kernel_submenu.append(
-                $("<li>").attr("id", "kernel-submenu-"+ks.name).append(
-                    $('<a>')
-                        .attr('href', '#')
-                        .click( function () {
-                            that.set_kernel(ks.name);
-                        })
-                        .text(ks.spec.display_name)
-                )
-            );
-            // Create the File > New Notebook submenu
-            new_notebook_submenu.append(
-                $("<li>").attr("id", "new-notebook-submenu-"+ks.name).append(
-                    $('<a>')
-                        .attr('href', '#')
-                        .click( function () {
-                            that.new_notebook(ks.name);
-                        })
-                        .text(ks.spec.display_name)
-                )
-            );
-
-        });
-        // trigger loaded promise
-        this._loaded = true;
-        this._finish_load();
-    };
-    
-    KernelSelector.prototype._spec_changed = function (event, ks) {
-        /** event handler for spec_changed */
-        var that = this;
-        
-        // update selection
-        this.current_selection = ks.name;
-        
-        // put the current kernel at the top of File > New Notebook
-        var cur_kernel_entry = $("#new-notebook-submenu-" + ks.name);
-        var parent = cur_kernel_entry.parent();
-        // do something only if there is more than one kernel
-        if (parent.children().length > 1) {
-            // first, sort back the submenu
-            parent.append(
-                parent.children("li[class!='divider']").sort(
-                    function (a,b) {
-                        var da = $("a",a).text();
-                        var db = $("a",b).text();
-                        if (da === db) {
-                            return 0;
-                        } else if (da > db) {
-                            return 1;
-                        } else {
-                            return -1;
-                        }}));
-            // then, if there is no divider yet, add one
-            if (!parent.children("li[class='divider']").length) {
-                parent.prepend($("<li>").attr("class","divider"));
-            } 
-            // finally, put the current kernel at the top
-            parent.prepend(cur_kernel_entry);
-        }
-        
-        // load logo
-        var logo_img = this.element.find("img.current_kernel_logo");
-        $("#kernel_indicator").find('.kernel_indicator_name').text(ks.spec.display_name);
-        if (ks.resources['logo-64x64']) {
-            logo_img.attr("src", ks.resources['logo-64x64']);
-            logo_img.attr("title", ks.spec.display_name);
-            logo_img.show();
-        } else {
-            logo_img.hide();
-        }
-        
-        // load kernel css
-        var css_url = ks.resources['kernel.css'];
-        if (css_url) {
-            $('#kernel-css').attr('href', css_url);
-        } else {
-            $('#kernel-css').attr('href', '');
-        }
-        
-        // load kernel js
-        if (ks.resources['kernel.js']) {
-
-            // Debug added for Notebook 4.2, please remove at some point in the
-            // future if the following does not append anymore when kernels
-            // have kernel.js
-            //
-            // > Uncaught (in promise) TypeError: require is not a function
-            // 
-            console.info('Dynamically requiring kernel.js, `requirejs` is ', requirejs);
-            requirejs([ks.resources['kernel.js']],
-                function (kernel_mod) {
-                    if (kernel_mod && kernel_mod.onload) {
-                        kernel_mod.onload();
-                    } else {
-                        console.warn("Kernel " + ks.name + " has a kernel.js file that does not contain "+
-                                     "any asynchronous module definition. This is undefined behavior "+
-                                     "and not recommended.");
-                    }
-                }, function (err) {
-                    console.warn("Failed to load kernel.js from ", ks.resources['kernel.js'], err);
-                }
-            );
-            this.events.on('spec_changed.Kernel', function (evt, new_ks) {
-                if (ks.name != new_ks.name) {
-                    console.warn("kernelspec %s had custom kernel.js. Forcing page reload for %s.",
-                        ks.name, new_ks.name);
-                    that.notebook.save_notebook().then(function () {
-                        window.location.reload();
-                    });
-                }
-            });
-        }
-    };
-
-    KernelSelector.prototype.set_kernel = function (selected) {
-        /** set the kernel by name, ensuring kernelspecs have been loaded, first 
-        
-        kernel can be just a kernel name, or a notebook kernelspec metadata
-        (name, language, display_name).
-        */
-        var that = this;
-        if (typeof selected === 'string') {
-            selected = {
-                name: selected
-            };
-        }
-        if (this._loaded) {
-            this._set_kernel(selected);
-        } else {
-            return this.loaded.then(function () {
-                that._set_kernel(selected);
-            });
-        }
-    };
-
-    KernelSelector.prototype._set_kernel = function (selected) {
-        /** Actually set the kernel (kernelspecs have been loaded) */
-        if (selected.name === this.current_selection) {
-            // only trigger event if value changed
-            return;
-        }
-        var kernelspecs = this.kernelspecs;
-        var ks = kernelspecs[selected.name];
-        if (ks === undefined) {
-            var available = _sorted_names(kernelspecs);
-            var matches = [];
-            if (selected.language && selected.language.length > 0) {
-                available.map(function (name) {
-                    if (kernelspecs[name].spec.language.toLowerCase() === selected.language.toLowerCase()) {
-                        matches.push(name);
-                    }
-                });
-            }
-            if (matches.length === 1) {
-                ks = kernelspecs[matches[0]];
-                console.log("No exact match found for " + selected.name +
-                    ", using only kernel that matches language=" + selected.language, ks);
-                this.events.trigger("spec_match_found.Kernel", {
-                    selected: selected,
-                    found: ks,
-                });
-            }
-            // if still undefined, trigger failure event
-            if (ks === undefined) {
-                this.events.trigger("spec_not_found.Kernel", {
-                    selected: selected,
-                    matches: matches,
-                    available: available,
-                });
-                return;
-            }
-        }
-        if (this.notebook._session_starting &&
-            this.notebook.session.kernel.name !== ks.name) {
-            console.error("Cannot change kernel while waiting for pending session start.");
-            return;
-        }
-        this.current_selection = ks.name;
-        this.events.trigger('spec_changed.Kernel', ks);
-    };
-    
-    KernelSelector.prototype._spec_not_found = function (event, data) {
-        var that = this;
-        var select = $("<select>").addClass('form-control');
-        console.warn("Kernelspec not found:", data);
-        var names;
-        if (data.matches.length > 1) {
-            names = data.matches;
-        } else {
-            names = data.available;
-        }
-        names.map(function (name) {
-            var ks = that.kernelspecs[name];
-            select.append(
-                $('<option/>').attr('value', ks.name).text(ks.spec.display_name || ks.name)
-            );
-        });
-        
-        var no_kernel_msg = i18n.msg.sprintf(i18n.msg._("Could not find a kernel matching %s. Please select a kernel:"),
-                (data.selected.display_name || data.selected.name))
-        var body = $("<form>").addClass("form-inline").append(
-            $("<span>").text(no_kernel_msg)
-        ).append(select);
-
-        // This statement is used simply so that message extraction
-        // will pick up the strings.  The actual setting of the text
-        // for the button is in dialog.js.
-        var button_labels = [ i18n.msg._("Continue Without Kernel"), i18n.msg._("Set Kernel"), i18n.msg._("OK") ];
-        
-        dialog.modal({
-            title : i18n.msg._('Kernel not found'),
-            body : body,
-            buttons : {
-                'Continue Without Kernel' : {
-                    class : 'btn-danger',
-                    click : function () {
-                        that.events.trigger('no_kernel.Kernel');
-                    }
-                },
-                'Set Kernel' : {
-                    class : 'btn-primary',
-                    click : function () {
-                        that.set_kernel(select.val());
-                    }
-                }
-            }
-        });
-    };
-
-    KernelSelector.prototype.new_notebook = function (kernel_name) {
-        
-        var w = window.open('', IPython._target);
-        // Create a new notebook in the same path as the current
-        // notebook's path.
-        var that = this;
-        var parent = utils.url_path_split(that.notebook.notebook_path)[0];
-        that.notebook.contents.new_untitled(parent, {type: "notebook"}).then(
-            function (data) {
-                var url = utils.url_path_join(
-                    that.notebook.base_url, 'notebooks',
-                    utils.encode_uri_components(data.path)
-                );
-                url += "?kernel_name=" + kernel_name;
-                w.location = url;
-            },
-            function(error) {
-                w.close();
-                dialog.modal({
-                    title : i18n.msg._('Creating Notebook Failed'),
-                    body : i18n.msg.sprintf(i18n.msg._("The error was: %s"), error.message),
-                    buttons : {'OK' : {'class' : 'btn-primary'}}
-                });
-            }
-        );
-    };
-
-    KernelSelector.prototype.lock_switch = function() {
-        // should set a flag and display warning+reload if user want to
-        // re-change kernel. As UI discussion never finish
-        // making that a separate PR.
-        console.warn('switching kernel is not guaranteed to work !');
-    };
-
-    KernelSelector.prototype.bind_events = function() {
-        var that = this;
-        this.events.on('spec_changed.Kernel', $.proxy(this._spec_changed, this));
-        this.events.on('spec_not_found.Kernel', $.proxy(this._spec_not_found, this));
-        this.events.on('kernel_created.Session', function (event, data) {
-            that.set_kernel(data.kernel.name);
-        });
-        
-        var logo_img = this.element.find("img.current_kernel_logo");
-        logo_img.on("load", function() {
-            logo_img.show();
-        });
-        logo_img.on("error", function() {
-            logo_img.hide();
-        });
-    };
-
-    return {'KernelSelector': KernelSelector};
-});
diff --git a/notebook/static/notebook/js/keyboardmanager.js b/notebook/static/notebook/js/keyboardmanager.js
deleted file mode 100644
index 9306b2fce..000000000
--- a/notebook/static/notebook/js/keyboardmanager.js
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-/**
- *
- *
- * @module keyboardmanager
- * @namespace keyboardmanager
- * @class KeyboardManager
- */
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/keyboard',
-], function($, utils, keyboard) {
-    "use strict";
-    
-    // Main keyboard manager for the notebook
-    var keycodes = keyboard.keycodes;
-
-    var KeyboardManager = function (options) {
-        /**
-         * A class to deal with keyboard event and shortcut
-         *
-         * @class KeyboardManager
-         * @constructor
-         * @param options {dict} Dictionary of keyword arguments :
-         *    @param options.events {$(Events)} instance 
-         *    @param options.pager: {Pager}  pager instance
-         */
-        this.mode = 'command';
-        this.enabled = true;
-        this.pager = options.pager;
-        this.quick_help = undefined;
-        this.notebook = undefined;
-        this.last_mode = undefined;
-        this.bind_events();
-        this.env = {pager:this.pager};
-        this.actions = options.actions;
-        this.command_shortcuts = new keyboard.ShortcutManager(undefined, options.events, this.actions, this.env, options.config, 'command');
-        this.command_shortcuts._add_default_shortcuts(this.get_default_common_shortcuts());
-        this.command_shortcuts._add_default_shortcuts(this.get_default_command_shortcuts());
-        this.edit_shortcuts = new keyboard.ShortcutManager(undefined, options.events, this.actions, this.env);
-        this.edit_shortcuts._add_default_shortcuts(this.get_default_common_shortcuts());
-        this.edit_shortcuts._add_default_shortcuts(this.get_default_edit_shortcuts());
-
-
-        this.config = options.config;
-        var that = this;
-
-        this.config.loaded.then(function(){ 
-            var edit_unbind;
-
-            try {
-                edit_unbind = that.config.data.keys.edit.unbind||[];
-            } catch (e) {
-                if (e instanceof TypeError) {
-                    edit_unbind = [];
-                } else {
-                    throw e;
-                }
-            }
-
-            edit_unbind.forEach(function(u){that.edit_shortcuts.remove_shortcut(u);});
-
-            var command_unbind;
-
-            try {
-                command_unbind = that.config.data.keys.command.unbind||[];
-            } catch (e) {
-                if (e instanceof TypeError) {
-                    command_unbind = [];
-                } else {
-                    throw e;
-                }
-            }
-
-            command_unbind.forEach(function(u){that.command_shortcuts.remove_shortcut(u);});
-
-            that.command_shortcuts.add_shortcuts( ((that.config.data.keys||{}).command||{}).bind);
-            that.edit_shortcuts.add_shortcuts(    ((that.config.data.keys||{}).edit   ||{}).bind);
-
-            }
-        );
-
-        Object.seal(this);
-    };
-
-
-
-
-    /**
-     * Return a dict of common shortcut
-     * @method get_default_common_shortcuts
-     *
-     * @example Example of returned shortcut
-     * ```
-     * 'shortcut-key': 'action-name'
-     * // a string representing the shortcut as dash separated value.
-     * // e.g. 'shift' , 'shift-enter', 'cmd-t'
-     *```
-     */
-    KeyboardManager.prototype.get_default_common_shortcuts = function() {
-        return {
-            'shift'       : 'jupyter-notebook:ignore',
-            'shift-enter' : 'jupyter-notebook:run-cell-and-select-next',
-            'alt-enter'   : 'jupyter-notebook:run-cell-and-insert-below',
-            'ctrl-enter'  : 'jupyter-notebook:run-cell',
-            // cmd on mac, ctrl otherwise
-            'cmdtrl-enter'  : 'jupyter-notebook:run-cell',
-            'cmdtrl-s'    : 'jupyter-notebook:save-notebook'
-        };
-    };
-
-    KeyboardManager.prototype.get_default_edit_shortcuts = function() {
-        return {
-            'cmdtrl-shift-p'      : 'jupyter-notebook:show-command-palette',
-            'cmdtrl-shift-f'      : 'jupyter-notebook:show-command-palette',
-            'esc'                 : 'jupyter-notebook:enter-command-mode',
-            'ctrl-m'              : 'jupyter-notebook:enter-command-mode',
-            'up'                  : 'jupyter-notebook:move-cursor-up',
-            'down'                : 'jupyter-notebook:move-cursor-down',
-            'ctrl-shift--'        : 'jupyter-notebook:split-cell-at-cursor',
-        };
-    };
-
-    KeyboardManager.prototype.get_default_command_shortcuts = function() {
-        return {
-            'cmdtrl-shift-p': 'jupyter-notebook:show-command-palette',
-            'cmdtrl-shift-f': 'jupyter-notebook:show-command-palette',
-            'shift-space': 'jupyter-notebook:scroll-notebook-up',
-            'shift-v' : 'jupyter-notebook:paste-cell-above',
-            'shift-m' : 'jupyter-notebook:merge-cells',
-            'shift-o' : 'jupyter-notebook:toggle-cell-output-scrolled',
-            'enter' : 'jupyter-notebook:enter-edit-mode',
-            'space' : 'jupyter-notebook:scroll-notebook-down',
-            'down' : 'jupyter-notebook:select-next-cell',
-            'i,i' : 'jupyter-notebook:interrupt-kernel',
-            '0,0' : 'jupyter-notebook:confirm-restart-kernel',
-            'd,d' : 'jupyter-notebook:delete-cell',
-            'esc': 'jupyter-notebook:close-pager',
-            'up' : 'jupyter-notebook:select-previous-cell',
-            'k' : 'jupyter-notebook:select-previous-cell',
-            'j' : 'jupyter-notebook:select-next-cell',
-            'shift-k': 'jupyter-notebook:extend-selection-above',
-            'shift-j': 'jupyter-notebook:extend-selection-below',
-            'shift-up': 'jupyter-notebook:extend-selection-above',
-            'shift-down': 'jupyter-notebook:extend-selection-below',
-            'cmdtrl-a': 'jupyter-notebook:select-all',
-            'x' : 'jupyter-notebook:cut-cell',
-            'c' : 'jupyter-notebook:copy-cell',
-            'v' : 'jupyter-notebook:paste-cell-below',
-            'a' : 'jupyter-notebook:insert-cell-above',
-            'b' : 'jupyter-notebook:insert-cell-below',
-            'y' : 'jupyter-notebook:change-cell-to-code',
-            'm' : 'jupyter-notebook:change-cell-to-markdown',
-            'r' : 'jupyter-notebook:change-cell-to-raw',
-            '1' : 'jupyter-notebook:change-cell-to-heading-1',
-            '2' : 'jupyter-notebook:change-cell-to-heading-2',
-            '3' : 'jupyter-notebook:change-cell-to-heading-3',
-            '4' : 'jupyter-notebook:change-cell-to-heading-4',
-            '5' : 'jupyter-notebook:change-cell-to-heading-5',
-            '6' : 'jupyter-notebook:change-cell-to-heading-6',
-            'o' : 'jupyter-notebook:toggle-cell-output-collapsed',
-            's' : 'jupyter-notebook:save-notebook',
-            'l' : 'jupyter-notebook:toggle-cell-line-numbers',
-            'shift-l' : 'jupyter-notebook:toggle-all-line-numbers',
-            'h' : 'jupyter-notebook:show-keyboard-shortcuts',
-            'z' : 'jupyter-notebook:undo-cell-deletion',
-            'q' : 'jupyter-notebook:close-pager',
-            'p' : 'jupyter-notebook:show-command-palette',
-        };
-    };
-
-    KeyboardManager.prototype.bind_events = function () {
-        var that = this;
-        $(document).keydown(function (event) {
-            if(event._ipkmIgnore===true||(event.originalEvent||{})._ipkmIgnore===true){
-                return false;
-            }
-            return that.handle_keydown(event);
-        });
-    };
-
-    KeyboardManager.prototype.set_notebook = function (notebook) {
-        this.notebook = notebook;
-        this.actions.extend_env({notebook:notebook});
-    };
-    
-    KeyboardManager.prototype.set_quickhelp = function (notebook) {
-        this.actions.extend_env({quick_help:notebook});
-    };
-
-
-    KeyboardManager.prototype.handle_keydown = function (event) {
-        /**
-         *  returning false from this will stop event propagation
-         **/
-
-        if (event.which === keycodes.esc) {
-            // Intercept escape at highest level to avoid closing
-            // websocket connection with firefox
-            event.preventDefault();
-        }
-        
-        if (!this.enabled) {
-            if (event.which === keycodes.esc) {
-                this.notebook.command_mode();
-                return false;
-            }
-            return true;
-        }
-        
-        if (this.mode === 'edit') {
-            return this.edit_shortcuts.call_handler(event);
-        } else if (this.mode === 'command') {
-            return this.command_shortcuts.call_handler(event);
-        }
-        return true;
-    };
-
-    KeyboardManager.prototype.edit_mode = function () {
-        this.last_mode = this.mode;
-        this.mode = 'edit';
-    };
-
-    KeyboardManager.prototype.command_mode = function () {
-        this.last_mode = this.mode;
-        this.mode = 'command';
-    };
-
-    KeyboardManager.prototype.enable = function () {
-        this.enabled = true;
-    };
-
-    KeyboardManager.prototype.disable = function () {
-        this.enabled = false;
-    };
-
-    KeyboardManager.prototype.register_events = function (e) {
-        e = $(e);
-        var that = this;
-        var handle_focus = function () {
-            that.disable();
-        };
-        var handle_blur = function () {
-            that.enable();
-        };
-        e.on('focusin', handle_focus);
-        e.on('focusout', handle_blur);
-        // TODO: Very strange. The focusout event does not seem fire for the 
-        // bootstrap textboxes on FF25&26...  This works around that by 
-        // registering focus and blur events recursively on all inputs within
-        // registered element.
-        e.find('input').blur(handle_blur);
-        e.on('DOMNodeInserted', function (event) {
-            var target = $(event.target);
-            if (target.is('input')) {
-                target.blur(handle_blur);
-            } else {
-                target.find('input').blur(handle_blur);    
-            }
-          });
-        // There are times (raw_input) where we remove the element from the DOM before
-        // focusout is called. In this case we bind to the remove event of jQueryUI,
-        // which gets triggered upon removal, iff it is focused at the time.
-        // is_focused must be used to check for the case where an element within
-        // the element being removed is focused.
-        e.on('remove', function () {
-            if (utils.is_focused(e[0])) {
-                that.enable();
-            }
-        });
-    };
-
-    return {'KeyboardManager': KeyboardManager};
-});
diff --git a/notebook/static/notebook/js/main.js b/notebook/static/notebook/js/main.js
deleted file mode 100644
index 5524598a3..000000000
--- a/notebook/static/notebook/js/main.js
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-// adapted from Mozilla Developer Network example at
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function/bind
-// shim `bind` for testing under casper.js
-var bind = function bind(obj) {
-  var slice = [].slice;
-  var args = slice.call(arguments, 1),
-    self = this,
-    nop = function() {
-    },
-    bound = function() {
-      return self.apply(this instanceof nop ? this : (obj || {}), args.concat(slice.call(arguments)));
-    };
-  nop.prototype = this.prototype || {}; // Firefox cries sometimes if prototype is undefined
-  bound.prototype = new nop();
-  return bound;
-};
-Function.prototype.bind = Function.prototype.bind || bind ;
-
-requirejs.config({
-  map: {
-    "*": {
-      "typeahead": "jquery-typeahead"
-    }
-  }
-})
-
-requirejs([
-    'jquery',
-    'contents',
-    'base/js/namespace',
-    'notebook/js/notebook',
-    'services/config',
-    'base/js/utils',
-    'base/js/page',
-    'base/js/events',
-    'base/js/promises',
-    'auth/js/loginwidget',
-    'notebook/js/maintoolbar',
-    'notebook/js/pager',
-    'notebook/js/promises',
-    'notebook/js/quickhelp',
-    'notebook/js/menubar',
-    'notebook/js/notificationarea',
-    'notebook/js/savewidget',
-    'notebook/js/actions',
-    'notebook/js/keyboardmanager',
-    'notebook/js/kernelselector',
-    'codemirror/lib/codemirror',
-    'notebook/js/about',
-    'notebook/js/searchandreplace',
-    'notebook/js/clipboard',
-    'bidi/bidi',
-    'notebook/js/celltoolbarpresets/tags'
-], function(
-    $,
-    contents_service,
-    IPython,
-    notebook,
-    configmod,
-    utils,
-    page,
-    events,
-    promises,
-    loginwidget,
-    maintoolbar,
-    pager,
-    nb_promises,
-    quickhelp,
-    menubar,
-    notificationarea,
-    savewidget,
-    actions,
-    keyboardmanager,
-    kernelselector,
-    CodeMirror,
-    about,
-    searchandreplace,
-    clipboard,
-    bidi
-    ) {
-    "use strict";
-
-    // Pull typeahead from the global jquery object
-    var typeahead = $.typeahead;
-    
-    try{
-        requirejs(['custom/custom'], function() {});
-        bidi.loadLocale();
-    } catch(err) {
-        console.log("Error processing custom.js. Logging and continuing");
-        console.warn(err);
-    }
-
-    // compat with old IPython, remove for IPython > 3.0
-    window.CodeMirror = CodeMirror;
-
-    // Setup all of the config related things
-    
-
-    var common_options = {
-        ws_url : utils.get_body_data("wsUrl"),
-        base_url : utils.get_body_data("baseUrl"),
-        notebook_path : utils.get_body_data("notebookPath"),
-        notebook_name : utils.get_body_data('notebookName')
-    };
-
-    var config_section = new configmod.ConfigSection('notebook', common_options);
-    config_section.load();
-    var common_config = new configmod.ConfigSection('common', common_options);
-    common_config.load();
-
-    // Instantiate the main objects
-    
-    var page = new page.Page('div#header', 'div#site');
-    var pager = new pager.Pager('div#pager', {
-        events: events});
-    var acts = new actions.init();
-    var keyboard_manager = new keyboardmanager.KeyboardManager({
-        pager: pager,
-        events: events,
-        actions: acts, 
-        config: config_section,
-    });
-    var save_widget = new savewidget.SaveWidget('span#save_widget', {
-        events: events,
-        keyboard_manager: keyboard_manager});
-    acts.extend_env({save_widget:save_widget});
-    var contents = new contents_service.Contents({
-          base_url: common_options.base_url,
-          common_config: common_config
-        });
-    var notebook = new notebook.Notebook('div#notebook', $.extend({
-        events: events,
-        keyboard_manager: keyboard_manager,
-        save_widget: save_widget,
-        contents: contents,
-        config: config_section},
-        common_options));
-    var login_widget = new loginwidget.LoginWidget('span#login_widget', common_options);
-    var toolbar = new maintoolbar.MainToolBar('#maintoolbar-container', {
-        notebook: notebook,
-        events: events,
-        actions: acts});
-    var quick_help = new quickhelp.QuickHelp({
-        keyboard_manager: keyboard_manager,
-        events: events,
-        notebook: notebook});
-    keyboard_manager.set_notebook(notebook);
-    keyboard_manager.set_quickhelp(quick_help);
-    var menubar = new menubar.MenuBar('#menubar', $.extend({
-        notebook: notebook,
-        contents: contents,
-        events: events,
-        save_widget: save_widget,
-        quick_help: quick_help,
-        actions: acts,
-        config: config_section},
-        common_options));
-    var notification_area = new notificationarea.NotebookNotificationArea(
-        '#notification_area', {
-        events: events,
-        save_widget: save_widget,
-        notebook: notebook,
-        keyboard_manager: keyboard_manager});
-    notification_area.init_notification_widgets();
-    var kernel_selector = new kernelselector.KernelSelector(
-        '#kernel_logo_widget', notebook);
-    searchandreplace.load(keyboard_manager);
-
-    $('body').append('<div id="fonttest"><pre><span id="test1">x</span>'+
-                     '<span id="test2" style="font-weight: bold;">x</span>'+
-                     '<span id="test3" style="font-style: italic;">x</span></pre></div>');
-    var nh = $('#test1').innerHeight();
-    var bh = $('#test2').innerHeight();
-    var ih = $('#test3').innerHeight();
-    if(nh != bh || nh != ih) {
-        $('head').append('<style>.CodeMirror span { vertical-align: bottom; }</style>');
-    }
-    $('#fonttest').remove();
-
-    page.show();
-
-    events.one('notebook_loaded.Notebook', function () {
-        var hash = document.location.hash;
-        if (hash) {
-            document.location.hash = '';
-            document.location.hash = hash;
-        }
-        notebook.set_autosave_interval(notebook.minimum_autosave_interval);
-    });
-
-    IPython.page = page;
-    IPython.notebook = notebook;
-    IPython.contents = contents;
-    IPython.pager = pager;
-    IPython.quick_help = quick_help;
-    IPython.login_widget = login_widget;
-    IPython.menubar = menubar;
-    IPython.toolbar = toolbar;
-    IPython.notification_area = notification_area;
-    IPython.keyboard_manager = keyboard_manager;
-    IPython.save_widget = save_widget;
-    IPython.tooltip = notebook.tooltip;
-
-    try {
-        events.trigger('app_initialized.NotebookApp');
-    } catch (e) {
-        console.error("Error in app_initialized callback", e);
-    }
-
-    Object.defineProperty( IPython, 'actions', {
-      get: function() {
-          console.warn('accessing "actions" on the global IPython/Jupyter is not recommended. Pass it to your objects constructors at creation time');
-          return acts;
-      },
-      enumerable: true,
-      configurable: false
-    });
-
-    clipboard.setup_clipboard_events();
-    
-    // Now actually load nbextensionsload_extensions_from_config
-    Promise.all([
-        utils.load_extensions_from_config(config_section),
-        utils.load_extensions_from_config(common_config),
-    ])
-    .catch(function(error) {
-        console.error('Could not load nbextensions from user config files', error);
-    })
-    // BEGIN HARDCODED WIDGETS HACK
-    .then(function() {
-        if (!utils.is_loaded('jupyter-js-widgets/extension')) {
-            // Fallback to the ipywidgets extension
-            utils.load_extension('widgets/notebook/js/extension').catch(function () {
-                console.warn('Widgets are not available.  Please install widgetsnbextension or ipywidgets 4.0');
-            });
-        }
-    })
-    .catch(function(error) {
-        console.error('Could not load ipywidgets', error);
-    });
-    // END HARDCODED WIDGETS HACK
-
-    notebook.load_notebook(common_options.notebook_path);
-
-});
diff --git a/notebook/static/notebook/js/maintoolbar.js b/notebook/static/notebook/js/maintoolbar.js
deleted file mode 100644
index 0d94e6afa..000000000
--- a/notebook/static/notebook/js/maintoolbar.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'require',
-    './toolbar',
-    './celltoolbar',
-    'base/js/i18n'
-], function($, requirejs, toolbar, celltoolbar, i18n) {
-    "use strict";
-
-    var MainToolBar = function (selector, options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  selector: string
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance
-         *          notebook: Notebook instance
-         **/
-        toolbar.ToolBar.apply(this, [selector, options] );
-        this.events = options.events;
-        this.notebook = options.notebook;
-        this._make();
-        Object.seal(this);
-    };
-
-    MainToolBar.prototype = Object.create(toolbar.ToolBar.prototype);
-
-    MainToolBar.prototype._make = function () {
-        var grps = [
-          [
-            ['jupyter-notebook:save-notebook'],
-            'save-notbook'
-          ],
-          [
-            ['jupyter-notebook:insert-cell-below'],
-            'insert_above_below'],
-          [
-            ['jupyter-notebook:cut-cell',
-             'jupyter-notebook:copy-cell',
-             'jupyter-notebook:paste-cell-below'
-            ] ,
-            'cut_copy_paste'],
-          [
-            ['jupyter-notebook:move-cell-up',
-             'jupyter-notebook:move-cell-down'
-            ],
-            'move_up_down'],
-          [ [new toolbar.Button('jupyter-notebook:run-cell-and-select-next',
-                {label: i18n.msg._('Run')}),
-             'jupyter-notebook:interrupt-kernel',
-             'jupyter-notebook:confirm-restart-kernel',
-             'jupyter-notebook:confirm-restart-kernel-and-run-all-cells'
-            ],
-            'run_int'],
-         ['<add_celltype_list>'],
-         [
-           ['jupyter-notebook:show-command-palette'],
-           'cmd_palette']
-        ];
-        this.construct(grps);
-    };
-
-    MainToolBar.prototype._pseudo_actions = {};
-
-    // add a cell type drop down to the maintoolbar.
-    // triggered when the pseudo action `<add_celltype_list>` is
-    // encountered when building a toolbar.
-    MainToolBar.prototype._pseudo_actions.add_celltype_list = function () {
-        var that = this;
-        var multiselect = $('<option/>').attr('value','multiselect').attr('disabled','').text('-');
-        var sel = $('<select/>')
-            .attr('id','cell_type')
-            .attr('aria-label', i18n.msg._('combobox, select cell type'))
-            .attr('role', 'combobox')
-            .addClass('form-control select-xs')
-            .append($('<option/>').attr('value','code').text(i18n.msg._('Code')))
-            .append($('<option/>').attr('value','markdown').text(i18n.msg._('Markdown')))
-            .append($('<option/>').attr('value','raw').text(i18n.msg._('Raw NBConvert')))
-            .append($('<option/>').attr('value','heading').text(i18n.msg._('Heading')))
-            .append(multiselect);
-        this.notebook.keyboard_manager.register_events(sel);
-        this.events.on('selected_cell_type_changed.Notebook', function (event, data) {
-            if (data.editable === false) {
-                sel.attr('disabled', true);
-            } else {
-                sel.removeAttr('disabled');
-            }
-
-            if (that.notebook.get_selected_cells_indices().length > 1) {
-                multiselect.show();
-                sel.val('multiselect');
-            } else {
-                multiselect.hide();
-                if (data.cell_type === 'heading') {
-                    sel.val('Markdown');
-                } else {
-                    sel.val(data.cell_type);
-                }
-            }
-        });
-        sel.change(function () {
-            var cell_type = $(this).val();
-            switch (cell_type) {
-            case 'code':
-                that.notebook.cells_to_code();
-                break;
-            case 'markdown':
-                that.notebook.cells_to_markdown();
-                break;
-            case 'raw':
-                that.notebook.cells_to_raw();
-                break;
-            case 'heading':
-                that.notebook._warn_heading();
-                that.notebook.to_heading();
-                sel.val('markdown');
-                break;
-            case 'multiselect':
-                break;
-            default:
-                console.log(i18n.msg._("unrecognized cell type:"), cell_type);
-            }
-            that.notebook.focus_cell();
-        });
-        return sel;
-
-    };
-
-    return {'MainToolBar': MainToolBar};
-});
diff --git a/notebook/static/notebook/js/mathjaxutils.js b/notebook/static/notebook/js/mathjaxutils.js
deleted file mode 100644
index a8257009a..000000000
--- a/notebook/static/notebook/js/mathjaxutils.js
+++ /dev/null
@@ -1,8 +0,0 @@
-
-define([
-    'base/js/mathjaxutils'
-], function(mathjaxutils) {
-    "use strict"
-
-    return mathjaxutils;
-});
diff --git a/notebook/static/notebook/js/menubar.js b/notebook/static/notebook/js/menubar.js
deleted file mode 100644
index aab86f79f..000000000
--- a/notebook/static/notebook/js/menubar.js
+++ /dev/null
@@ -1,469 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'base/js/dialog',
-    'base/js/utils',
-    'base/js/i18n',
-    'notebook/js/quickhelp',
-    './celltoolbar',
-    './tour',
-    'moment',
-], function($, IPython, dialog, utils, i18n, quickhelp, celltoolbar, tour, moment) {
-    "use strict";
-
-    var MenuBar = function (selector, options) {
-        /**
-         * Constructor
-         *
-         * A MenuBar Class to generate the menubar of Jupyter notebook
-         *
-         * Parameters:
-         *  selector: string
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          notebook: Notebook instance
-         *          render keyboard shortcuts from KeyboardManager
-         *          contents: ContentManager instance
-         *          events: $(Events) instance
-         *          save_widget: SaveWidget instance
-         *          quick_help: QuickHelp instance
-         *          base_url : string
-         *          notebook_path : string
-         *          notebook_name : string
-         *          config: ConfigSection instance
-         */
-        options = options || {};
-        this.base_url = options.base_url || utils.get_body_data("baseUrl");
-        this.selector = selector;
-        this.notebook = options.notebook;
-        this.keyboard_manager = this.notebook.keyboard_manager;
-        this.actions = this.keyboard_manager.actions;
-        this.contents = options.contents;
-        this.events = options.events;
-        this.save_widget = options.save_widget;
-        this.quick_help = options.quick_help;
-        this.actions = options.actions;
-        this.config = options.config;
-
-        try {
-            this.tour = new tour.Tour(this.notebook, this.events);
-        } catch (e) {
-            this.tour = undefined;
-            console.log("Failed to instantiate Notebook Tour", e);
-        }
-
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.style();
-            this.add_bundler_items();
-            this.bind_events();
-        }
-    };
-
-    // TODO: This has definitively nothing to do with style ...
-    MenuBar.prototype.style = function () {
-        var that = this;
-        this.element.find("li").click(function (event, ui) {
-                // The selected cell loses focus when the menu is entered, so we
-                // re-select it upon selection.
-                var i = that.notebook.get_selected_index();
-                that.notebook.select(i, false);
-            }
-        );
-    };
-    
-    MenuBar.prototype.add_bundler_items = function() {
-        var that = this;
-        this.config.loaded.then(function() {
-            var bundlers = that.config.data.bundlerextensions;
-            if(bundlers) {
-                // Stable sort the keys to ensure menu items don't hop around
-                var ids = Object.keys(bundlers).sort()
-                ids.forEach(function(bundler_id) {
-                    var bundler = bundlers[bundler_id];
-                    var group = that.element.find('#'+bundler.group+'_menu')
-                    
-                    // Validate menu item metadata
-                    if(!group.length) {
-                        console.warn('unknown group', bundler.group, 'for bundler ID', bundler_id, '; skipping');
-                        return;
-                    } else if(!bundler.label) {
-                        console.warn('no label for bundler ID', bundler_id, '; skipping');
-                        return;
-                    }
-                    
-                    // Insert menu item into correct group, click handler
-                    group.parent().removeClass('hidden');
-                    var $li = $('<li>')
-                        .appendTo(group);
-                    $('<a>')
-                        .attr('href', '#')
-                        .text(bundler.label)
-                        .appendTo($li)
-                        .on('click', that._bundle.bind(that, bundler_id))
-                        .appendTo($li);
-                });
-            }
-        });
-    };
-
-    MenuBar.prototype._new_window = function(url) {
-        var w = window.open('', IPython._target);
-        if (this.notebook.dirty && this.notebook.writable) {
-            this.notebook.save_notebook().then(function() {
-                w.location = url;
-            });
-        } else {
-            w.location = url;
-        }
-    };
-    
-    MenuBar.prototype._bundle = function(bundler_id) {
-        // Read notebook path and base url here in case they change
-        var notebook_path = utils.encode_uri_components(this.notebook.notebook_path);
-        var url = utils.url_path_join(
-            this.base_url,
-            'bundle',
-            notebook_path
-        ) + '?bundler=' + utils.encode_uri_components(bundler_id);
-
-        this._new_window(url);
-    };
-
-    MenuBar.prototype._nbconvert = function (format, download) {
-        download = download || false;
-        var notebook_path = utils.encode_uri_components(this.notebook.notebook_path);
-        var url = utils.url_path_join(
-            this.base_url,
-            'nbconvert',
-            format,
-            notebook_path
-        ) + "?download=" + download.toString();
-        
-        this._new_window(url);
-    };
-
-    MenuBar.prototype._size_header = function() {
-        /** 
-         * Update header spacer size.
-         */
-        console.warn('`_size_header` is deprecated and will be removed in future versions.'+
-                     ' Please trigger the `resize-header.Page` manually if you rely on it.');
-        this.events.trigger('resize-header.Page');
-    };
-
-    (function($){
-        $(document).ready(function(){
-            $('ul.dropdown-menu [data-toggle=dropdown]').on('click', function(event) {
-                event.preventDefault(); 
-                event.stopPropagation(); 
-                $(this).parent().siblings().removeClass('open');
-                $(this).parent().toggleClass('open');
-            });
-        });
-    })(jQuery);
-
-    MenuBar.prototype.bind_events = function () {
-        /**
-         *  File
-         */
-        var that = this;
-        
-
-        this.element.find('#open_notebook').click(function () {
-            var parent = utils.url_path_split(that.notebook.notebook_path)[0];
-            window.open(
-                utils.url_path_join(
-                    that.base_url, 'tree',
-                    utils.encode_uri_components(parent)
-                ), IPython._target);
-        });
-        this.element.find('#copy_notebook').click(function () {
-            that.notebook.copy_notebook();
-            return false;
-        });
-        this.element.find('#save_notebook_as').click(function() {
-            that.notebook.save_notebook_as();
-            return false;
-        });
-        
-        this.element.find('#print_preview').click(function () {
-            that._nbconvert('html', false);
-        });
-
-        this.element.find('#download_menu li').click(function (ev) {
-            that._nbconvert(ev.target.parentElement.getAttribute('id').substring(9), true);
-        });
-
-        this.events.on('trust_changed.Notebook', function (event, trusted) {
-            if (trusted) {
-                that.element.find('#trust_notebook')
-                    .addClass("disabled").off('click')
-                    .find("a").text(i18n.msg._("Trusted Notebook"));
-            } else {
-                that.element.find('#trust_notebook')
-                    .removeClass("disabled").on('click', function () {
-                        that.notebook.trust_notebook();
-                    })
-                    .find("a").text(i18n.msg._("Trust Notebook"));
-            }
-        });
-
-        // View
-        this._add_celltoolbar_list();
-
-        // Edit
-        this.element.find('#edit_nb_metadata').click(function () {
-            that.notebook.edit_metadata({
-                notebook: that.notebook,
-                keyboard_manager: that.notebook.keyboard_manager});
-        });
-
-        var id_actions_dict = {
-            '#trust_notebook' : 'trust-notebook',
-            '#rename_notebook' : 'rename-notebook',
-            '#find_and_replace' : 'find-and-replace',
-            '#save_checkpoint': 'save-notebook',
-            '#shutdown_kernel': 'confirm-shutdown-kernel',
-            '#restart_kernel': 'confirm-restart-kernel',
-            '#restart_clear_output': 'confirm-restart-kernel-and-clear-output',
-            '#restart_run_all': 'confirm-restart-kernel-and-run-all-cells',
-            '#close_and_halt': 'close-and-halt',
-            '#int_kernel': 'interrupt-kernel',
-            '#cut_cell': 'cut-cell',
-            '#copy_cell': 'copy-cell',
-            '#paste_cell_above': 'paste-cell-above',
-            '#paste_cell_below': 'paste-cell-below',
-            '#paste_cell_replace': 'paste-cell-replace',
-            '#delete_cell': 'delete-cell',
-            '#undelete_cell': 'undo-cell-deletion',
-            '#split_cell': 'split-cell-at-cursor',
-            '#merge_cell_above': 'merge-cell-with-previous-cell',
-            '#merge_cell_below': 'merge-cell-with-next-cell',
-            '#move_cell_up': 'move-cell-up',
-            '#move_cell_down': 'move-cell-down',
-            '#toggle_header': 'toggle-header',
-            '#toggle_toolbar': 'toggle-toolbar',
-            '#toggle_line_numbers': 'toggle-all-line-numbers',
-            '#insert_cell_above': 'insert-cell-above',
-            '#insert_cell_below': 'insert-cell-below',
-            '#run_cell': 'run-cell',
-            '#run_cell_select_below': 'run-cell-and-select-next',
-            '#run_cell_insert_below': 'run-cell-and-insert-below',
-            '#run_all_cells': 'run-all-cells',
-            '#run_all_cells_above': 'run-all-cells-above',
-            '#run_all_cells_below': 'run-all-cells-below',
-            '#to_code': 'change-cell-to-code',
-            '#to_markdown': 'change-cell-to-markdown',
-            '#to_raw': 'change-cell-to-raw',
-            '#toggle_current_output': 'toggle-cell-output-collapsed',
-            '#toggle_current_output_scroll': 'toggle-cell-output-scrolled',
-            '#clear_current_output': 'clear-cell-output',
-            '#toggle_all_output': 'toggle-all-cells-output-collapsed',
-            '#toggle_all_output_scroll': 'toggle-all-cells-output-scrolled',
-            '#clear_all_output': 'clear-all-cells-output',
-            '#cut_cell_attachments': 'cut-cell-attachments',
-            '#copy_cell_attachments': 'copy-cell-attachments',
-            '#paste_cell_attachments': 'paste-cell-attachments',
-            '#insert_image': 'insert-image',
-            '#keyboard_shortcuts' : 'show-keyboard-shortcuts',
-            '#edit_keyboard_shortcuts' : 'edit-command-mode-keyboard-shortcuts',
-        };
-
-        for(var idx in id_actions_dict){
-            if (!id_actions_dict.hasOwnProperty(idx)){
-                continue;
-            }
-            var id_act = 'jupyter-notebook:'+id_actions_dict[idx];
-            if(!that.actions.exists(id_act)){
-                console.warn('actions', id_act, 'does not exist, still binding it in case it will be defined later...');
-            }
-            // Immediately-Invoked Function Expression cause JS.
-            (function(that, id_act, idx){
-                var el = that.element.find(idx);
-                el.click(function(event){
-                    that.actions.call(id_act, event);
-                });
-                
-                var keybinding = that.keyboard_manager.command_shortcuts.get_action_shortcut(id_act) || that.keyboard_manager.edit_shortcuts.get_action_shortcut(id_act);
-                
-                if (keybinding) {
-                    var shortcut = quickhelp.humanize_sequence(keybinding);
-                    var link_element = el.children('a');
-                    var text = link_element.text();
-                    link_element.text('');
-                    link_element.addClass('menu-shortcut-container');
-                    link_element.append('<span class="action">' + text + '</span>');
-                    link_element.append('<span class="kb">' + shortcut + '</span>');
-                }
-            })(that, id_act, idx);
-        }
-
-        
-        // Kernel
-        this.element.find('#reconnect_kernel').click(function () {
-            that.notebook.kernel.reconnect();
-        });
-        // Help
-        if (this.tour) {
-            this.element.find('#notebook_tour').click(function () {
-                that.tour.start();
-            });
-        } else {
-            this.element.find('#notebook_tour').addClass("disabled");
-        }
-        
-        this.update_restore_checkpoint(null);
-        
-        this.events.on('checkpoints_listed.Notebook', function (event, data) {
-            that.update_restore_checkpoint(that.notebook.checkpoints);
-        });
-        
-        this.events.on('checkpoint_created.Notebook', function (event, data) {
-            that.update_restore_checkpoint(that.notebook.checkpoints);
-        });
-        
-        this.events.on('notebook_loaded.Notebook', function() {
-            var langinfo = that.notebook.metadata.language_info || {};
-            that.update_nbconvert_script(langinfo);
-        });
-        
-        this.events.on('kernel_ready.Kernel', function(event, data) {
-            var langinfo = data.kernel.info_reply.language_info || {};
-            that.update_nbconvert_script(langinfo);
-            that.add_kernel_help_links(data.kernel.info_reply.help_links || []);
-        });
-    };
-    
-    MenuBar.prototype._add_celltoolbar_list = function () {
-        var that = this;
-        var submenu = $("#menu-cell-toolbar-submenu");
-        
-        function preset_added(event, data) {
-            var name = data.name;
-            submenu.append(
-                $("<li/>")
-                .attr('data-name', encodeURIComponent(name))
-                .append(
-                    $("<a/>")
-                    .attr('href', '#')
-                    .text(name)
-                    .click(function () {
-                        if (name ==='None') {
-                            celltoolbar.CellToolbar.global_hide();
-                            delete that.notebook.metadata.celltoolbar;
-                        } else {
-                            celltoolbar.CellToolbar.global_show();
-                            celltoolbar.CellToolbar.activate_preset(name, that.events);
-                            that.notebook.metadata.celltoolbar = name;
-                        }
-                        that.notebook.focus_cell();
-                    })
-                )
-            );
-        }
-        
-        // Setup the existing presets
-        var presets = celltoolbar.CellToolbar.list_presets();
-        preset_added(null, {name: i18n.msg._("None")});
-        presets.map(function (name) {
-            preset_added(null, {name: name});
-        });
-
-        // Setup future preset registrations
-        this.events.on('preset_added.CellToolbar', preset_added);
-        
-        // Handle unregistered presets
-        this.events.on('unregistered_preset.CellToolbar', function (event, data) {
-            submenu.find("li[data-name='" + encodeURIComponent(data.name) + "']").remove();
-        });
-    };
-
-    MenuBar.prototype.update_restore_checkpoint = function(checkpoints) {
-        var ul = this.element.find("#restore_checkpoint").find("ul");
-        ul.empty();
-        if (!checkpoints || checkpoints.length === 0) {
-            ul.append(
-                $("<li/>")
-                .addClass("disabled")
-                .append(
-                    $("<a/>")
-                    .text(i18n.msg._("No checkpoints"))
-                )
-            );
-            return;
-        }
-        
-        var that = this;
-        checkpoints.map(function (checkpoint) {
-            var d = new Date(checkpoint.last_modified);
-            ul.append(
-                $("<li/>").append(
-                    $("<a/>")
-                    .attr("href", "#")
-                    .text(moment(d).format("LLLL"))
-                    .click(function () {
-                        that.notebook.restore_checkpoint_dialog(checkpoint);
-                    })
-                )
-            );
-        });
-    };
-    
-    MenuBar.prototype.update_nbconvert_script = function(langinfo) {
-        /**
-         * Set the 'Download as foo' menu option for the relevant language.
-         */
-        var el = this.element.find('#download_script');
-        
-        // Set menu entry text to e.g. "Python (.py)"
-        var langname = (langinfo.name || 'Script');
-        langname = langname.charAt(0).toUpperCase()+langname.substr(1); // Capitalise
-        el.find('a').text(langname + ' ('+(langinfo.file_extension || 'txt')+')');
-    };
-
-    MenuBar.prototype.add_kernel_help_links = function(help_links) {
-        /** add links from kernel_info to the help menu */
-        var divider = $("#kernel-help-links");
-        if (divider.length === 0) {
-            // insert kernel help section above about link
-            var about = $("#notebook_about").parent();
-            divider = $("<li>")
-                .attr('id', "kernel-help-links")
-                .addClass('divider');
-            about.prev().before(divider);
-        }
-        // remove previous entries
-        while (!divider.next().hasClass('divider')) {
-            divider.next().remove();
-        }
-        if (help_links.length === 0) {
-            // no help links, remove the divider
-            divider.remove();
-            return;
-        }
-        var cursor = divider;
-        help_links.map(function (link) {
-            cursor.after($("<li>")
-                .append($("<a>")
-                    .attr('target', '_blank')
-                    .attr('title', i18n.msg._('Opens in a new window'))
-                    .attr('href', requirejs.toUrl(link.url))
-                    .append($("<i>")
-                        .addClass("fa fa-external-link menu-icon pull-right")
-                    )
-                    .append($("<span>")
-                        .text(link.text)
-                    )
-                )
-            );
-            cursor = cursor.next();
-        });
-        
-    };
-
-    return {'MenuBar': MenuBar};
-});
diff --git a/notebook/static/notebook/js/notebook.js b/notebook/static/notebook/js/notebook.js
deleted file mode 100644
index 967362ab5..000000000
--- a/notebook/static/notebook/js/notebook.js
+++ /dev/null
@@ -1,3508 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-/**
- * @module notebook
- */
-"use strict";
-define([
-    'jquery',
-    'base/js/namespace',
-    'underscore',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/dialog',
-    'base/js/markdown',
-    './cell',
-    './textcell',
-    './codecell',
-    'moment',
-    'services/config',
-    'services/sessions/session',
-    './celltoolbar',
-    'codemirror/lib/codemirror',
-    'codemirror/addon/runmode/runmode',
-    'base/js/mathjaxutils',
-    'base/js/keyboard',
-    './tooltip',
-    './celltoolbarpresets/default',
-    './celltoolbarpresets/rawcell',
-    './celltoolbarpresets/slideshow',
-    './celltoolbarpresets/attachments',
-    './celltoolbarpresets/tags',
-    './scrollmanager',
-    './commandpalette',
-    './shortcuteditor',
-], function (
-    $,
-    IPython,
-    _,
-    utils,
-    i18n,
-    dialog,
-    markdown,
-    cellmod,
-    textcell,
-    codecell,
-    moment,
-    configmod,
-    session,
-    celltoolbar,
-    CodeMirror,
-    runMode,
-    mathjaxutils,
-    keyboard,
-    tooltip,
-    default_celltoolbar,
-    rawcell_celltoolbar,
-    slideshow_celltoolbar,
-    attachments_celltoolbar,
-    tags_celltoolbar,
-    scrollmanager,
-    commandpalette,
-    shortcuteditor
-) {
-
-    var ShortcutEditor = shortcuteditor.ShortcutEditor;
-
-    var _SOFT_SELECTION_CLASS = 'jupyter-soft-selected';
-
-    function soft_selected(cell){
-        return cell.element.hasClass(_SOFT_SELECTION_CLASS);
-    }
-
-    /**
-     * Contains and manages cells.
-     * @class Notebook
-     * @param {string}          selector
-     * @param {object}          options - Dictionary of keyword arguments.  
-     * @param {jQuery}          options.events - selector of Events
-     * @param {KeyboardManager} options.keyboard_manager
-     * @param {Contents}        options.contents
-     * @param {SaveWidget}      options.save_widget
-     * @param {object}          options.config
-     * @param {string}          options.base_url
-     * @param {string}          options.notebook_path
-     * @param {string}          options.notebook_name
-     */
-    function Notebook(selector, options) {
-        this.config = options.config;
-        this.config.loaded.then(this.validate_config.bind(this));
-        this.class_config = new configmod.ConfigWithDefaults(this.config, 
-                                        Notebook.options_default, 'Notebook');
-        this.base_url = options.base_url;
-        this.notebook_path = options.notebook_path;
-        this.notebook_name = options.notebook_name;
-        this.events = options.events;
-        this.keyboard_manager = options.keyboard_manager;
-        this.contents = options.contents;
-        this.save_widget = options.save_widget;
-        this.tooltip = new tooltip.Tooltip(this.events);
-        this.ws_url = options.ws_url;
-        this._session_starting = false;
-        this.last_modified = null;
-        // debug 484
-        this._last_modified = 'init';
-        // Firefox workaround
-        this._ff_beforeunload_fired = false;
-
-        //  Create default scroll manager.
-        this.scroll_manager = new scrollmanager.ScrollManager(this);
-
-        // TODO: This code smells (and the other `= this` line a couple lines down)
-        // We need a better way to deal with circular instance references.
-        this.keyboard_manager.notebook = this;
-        this.save_widget.notebook = this;
-        
-        mathjaxutils.init();
-
-        this.element = $(selector);
-        this.element.scroll();
-        this.element.data("notebook", this);
-        this.session = null;
-        this.kernel = null;
-        this.kernel_busy = false;
-        this.clipboard = null;
-        this.clipboard_attachments = null;
-        this.undelete_backup_stack = [];
-        this.paste_enabled = false;
-        this.paste_attachments_enabled = false;
-        this.writable = false;
-        // It is important to start out in command mode to match the initial mode
-        // of the KeyboardManager.
-        this.mode = 'command';
-        this.set_dirty(false);
-        this.metadata = {};
-        this._checkpoint_after_save = false;
-        this.last_checkpoint = null;
-        this.checkpoints = [];
-        this.autosave_interval = 0;
-        this.autosave_timer = null;
-        // autosave *at most* every two minutes
-        this.minimum_autosave_interval = 120000;
-        this.notebook_name_blacklist_re = /[\/\\:]/;
-        this.nbformat = 4; // Increment this when changing the nbformat
-        this.nbformat_minor = this.current_nbformat_minor = 1; // Increment this when changing the nbformat
-        this.codemirror_mode = 'text';
-        this.create_elements();
-        this.bind_events();
-        this.kernel_selector = null;
-        this.dirty = null;
-        this.trusted = null;
-        this._changed_on_disk_dialog = null;
-        this._fully_loaded = false;
-
-        // Trigger cell toolbar registration.
-        default_celltoolbar.register(this);
-        rawcell_celltoolbar.register(this);
-        slideshow_celltoolbar.register(this);
-        attachments_celltoolbar.register(this);
-        tags_celltoolbar.register(this);
-
-        var that = this;
-
-        Object.defineProperty(this, 'line_numbers', {
-            get: function() {
-                var d = that.config.data || {};
-                var cmc =  (d['Cell'] || {}) ['cm_config'] || {};
-                return cmc['lineNumbers'] || false;
-            },
-            set: function(value) {
-                that.config.update({
-                    'Cell': {
-                        'cm_config': {
-                            'lineNumbers':value
-                        }
-                    }
-                });
-            }
-        });
-        
-        Object.defineProperty(this, 'header', {
-            get: function() {
-                return that.class_config.get_sync('Header');
-            },
-            set: function(value) {
-                that.class_config.set('Header', value);
-            }
-        });
-                
-        Object.defineProperty(this, 'toolbar', {
-            get: function() {
-                return that.class_config.get_sync('Toolbar');
-            },
-            set: function(value) {
-                that.class_config.set('Toolbar', value);
-            }
-        });
-        
-        this.class_config.get('Header').then(function(header) {
-            if (header === false) {
-                that.keyboard_manager.actions.call('jupyter-notebook:hide-header');
-            }
-        });
-        
-        this.class_config.get('Toolbar').then(function(toolbar) {
-          if (toolbar === false) {
-              that.keyboard_manager.actions.call('jupyter-notebook:hide-toolbar');
-          }
-        });
-        
-        // prevent assign to miss-typed properties.
-        Object.seal(this);
-    }
-
-    Notebook.options_default = {
-        // can be any cell type, or the special values of
-        // 'above', 'below', or 'selected' to get the value from another cell.
-        default_cell_type: 'code',
-        Header: true,
-        Toolbar: true,
-        kill_kernel: false
-    };
-
-    Notebook.prototype.validate_config = function() {
-        var code_cell = this.config.data['CodeCell'] || {};
-        var cm_keymap = (code_cell['cm_config'] || {})['keyMap'];
-        if (cm_keymap && CodeMirror.keyMap[cm_keymap] === undefined) {
-            console.warn('CodeMirror keymap not found, ignoring: ' + cm_keymap);
-            delete code_cell.cm_config.keyMap;
-        }
-    };
-
-    /**
-     * Create an HTML and CSS representation of the notebook.
-     */
-    Notebook.prototype.create_elements = function () {
-        var that = this;
-        this.element.attr('tabindex','-1');
-        this.container = $("<div/>").addClass("container").attr("id", "notebook-container");
-        // We add this end_space div to the end of the notebook div to:
-        // i) provide a margin between the last cell and the end of the notebook
-        // ii) to prevent the div from scrolling up when the last cell is being
-        // edited, but is too low on the page, which browsers will do automatically.
-        var end_space = $('<div/>')
-            .addClass('end_space');
-        end_space.dblclick(function () {
-            var ncells = that.ncells();
-            that.insert_cell_below('code',ncells-1);
-        });
-        this.element.append(this.container);
-        this.container.after(end_space);
-    };
-
-    /**
-     * Bind JavaScript events: key presses and custom Jupyter events.
-     */
-    Notebook.prototype.bind_events = function () {
-        var that = this;
-
-
-        this.events.on('set_next_input.Notebook', function (event, data) {
-            if (data.replace) {
-                data.cell.set_text(data.text);
-                if (data.clear_output !== false) {
-                  // default (undefined) is true to preserve prior behavior
-                  data.cell.clear_output();
-                }
-            } else {
-                var index = that.find_cell_index(data.cell);
-                var new_cell = that.insert_cell_below('code',index);
-                new_cell.set_text(data.text);
-            }
-            that.dirty = true;
-        });
-
-        this.events.on('unrecognized_cell.Cell', function () {
-            that.warn_nbformat_minor();
-        });
-
-        this.events.on('unrecognized_output.OutputArea', function () {
-            that.warn_nbformat_minor();
-        });
-
-        this.events.on('set_dirty.Notebook', function (event, data) {
-            that.dirty = data.value;
-        });
-
-        this.events.on('trust_changed.Notebook', function (event, trusted) {
-            that.trusted = trusted;
-        });
-
-        this.events.on('select.Cell', function (event, data) {
-            var index = that.find_cell_index(data.cell);
-            that.select(index, !data.extendSelection);
-        });
-
-        this.events.on('edit_mode.Cell', function (event, data) {
-            that.handle_edit_mode(data.cell);
-        });
-
-        this.events.on('command_mode.Cell', function (event, data) {
-            that.handle_command_mode(data.cell);
-        });
-        
-        this.events.on('spec_changed.Kernel', function(event, data) {
-            var existing_spec = that.metadata.kernelspec;
-            that.metadata.kernelspec = {
-                name: data.name,
-                display_name: data.spec.display_name,
-                language: data.spec.language,
-            };
-            if (!existing_spec || ! _.isEqual(existing_spec, that.metadata.kernelspec)) {
-                that.set_dirty(true);
-            }
-            // start a new session
-            that.start_session(data.name);
-        });
-
-        this.events.on('kernel_ready.Kernel', function(event, data) {
-            var kinfo = data.kernel.info_reply;
-            if (!kinfo.language_info) {
-                delete that.metadata.language_info;
-                return;
-            }
-            var existing_info = that.metadata.language_info;
-            var langinfo = kinfo.language_info;
-            that.metadata.language_info = langinfo;
-            if (!existing_info || ! _.isEqual(existing_info, langinfo)) {
-                that.set_dirty(true);
-            }
-            // Mode 'null' should be plain, unhighlighted text.
-            var cm_mode = langinfo.codemirror_mode || langinfo.name || 'null';
-            that.set_codemirror_mode(cm_mode);
-        });
-        
-        this.events.on('kernel_idle.Kernel', function () {
-            that.kernel_busy = false;
-        });
-        
-        this.events.on('kernel_busy.Kernel', function () {
-            that.kernel_busy = true;
-        });
-
-        var collapse_time = function (time) {
-            var app_height = $('#ipython-main-app').height(); // content height
-            var splitter_height = $('div#pager_splitter').outerHeight(true);
-            var new_height = app_height - splitter_height;
-            that.element.animate({height : new_height + 'px'}, time);
-        };
-
-        this.element.bind('collapse_pager', function (event, extrap) {
-            var time = (extrap !== undefined) ? ((extrap.duration !== undefined ) ? extrap.duration : 'fast') : 'fast';
-            collapse_time(time);
-        });
-
-        var expand_time = function (time) {
-            var app_height = $('#ipython-main-app').height(); // content height
-            var splitter_height = $('div#pager_splitter').outerHeight(true);
-            var pager_height = $('div#pager').outerHeight(true);
-            var new_height = app_height - pager_height - splitter_height;
-            that.element.animate({height : new_height + 'px'}, time);
-        };
-
-        this.element.bind('expand_pager', function (event, extrap) {
-            var time = (extrap !== undefined) ? ((extrap.duration !== undefined ) ? extrap.duration : 'fast') : 'fast';
-            expand_time(time);
-        });
-
-
-        // Firefox 22 broke $(window).on("beforeunload")
-        // I'm not sure why or how.
-        window.onbeforeunload = function () {
-            /* Make kill kernel configurable.
-            example in custom.js:
-                var notebook = Jupyter.notebook;
-                var config = notebook.config;
-                var patch = {
-                    Notebook:{
-                        kill_kernel: true
-                    }
-                };
-                config.update(patch);
-            */
-            var kill_kernel = that.class_config.get_sync("kill_kernel");
-            if (kill_kernel) {
-                that.session.delete();
-            }
-            if ( utils.browser[0] === "Firefox") {
-                // Workaround ancient Firefox bug showing beforeunload twice: https://bugzilla.mozilla.org/show_bug.cgi?id=531199
-                if (that._ff_beforeunload_fired) {
-                    return; // don't show twice on FF
-                }
-                that._ff_beforeunload_fired = true;
-                // unset flag immediately after dialog is dismissed
-                setTimeout(function () {
-                    that._ff_beforeunload_fired = false;
-                }, 1);
-            }
-            // if we are autosaving, trigger an autosave on nav-away.
-            // still warn, because if we don't the autosave may fail.
-            if (that.dirty) {
-                if ( that.autosave_interval ) {
-                    // schedule autosave in a timeout
-                    // this gives you a chance to forcefully discard changes
-                    // by reloading the page if you *really* want to.
-                    // the timer doesn't start until you *dismiss* the dialog.
-                    setTimeout(function () {
-                        if (that.dirty) {
-                            that.save_notebook();
-                        }
-                    }, 1000);
-                    return i18n.msg._("Autosave in progress, latest changes may be lost.");
-                } else {
-                    return i18n.msg._("Unsaved changes will be lost.");
-                }
-            }
-            // if the kernel is busy, prompt the user if he’s sure
-            if (that.kernel_busy) {
-                return i18n.msg._("The Kernel is busy, outputs may be lost.");
-            }
-            // IE treats null as a string.  Instead just return which will avoid the dialog.
-            return;
-        };
-    };
-    
-
-    Notebook.prototype.show_command_palette = function() {
-        new commandpalette.CommandPalette(this);
-    };
-
-    Notebook.prototype.show_shortcuts_editor = function() {
-        new ShortcutEditor(this);
-    };
-
-    /**
-     * Trigger a warning dialog about missing functionality from newer minor versions
-     */
-    Notebook.prototype.warn_nbformat_minor = function () {
-        var v = 'v' + this.nbformat + '.';
-        var orig_vs = v + this.nbformat_minor;
-        var this_vs = v + this.current_nbformat_minor;
-        var msg = i18n.msg.sprintf(i18n.msg._("This notebook is version %1$s, but we only fully support up to %2$s."),
-                orig_vs,this_vs) + " " +
-                i18n.msg._("You can still work with this notebook, but cell and output types introduced in later notebook versions will not be available.");
-
-        // This statement is used simply so that message extraction
-        // will pick up the strings.  The actual setting of the text
-        // for the button is in dialog.js.
-        var button_labels = [ 
-            i18n.msg._("OK"),
-            i18n.msg._("Restart and Run All Cells"),
-            i18n.msg._("Restart and Clear All Outputs"),
-            i18n.msg._("Restart"),
-            i18n.msg._("Continue Running"),
-            i18n.msg._("Reload"),
-            i18n.msg._("Cancel"),
-            i18n.msg._("Overwrite"),
-            i18n.msg._("Trust"),
-            i18n.msg._("Revert")];
-        
-        dialog.modal({
-            notebook: this,
-            keyboard_manager: this.keyboard_manager,
-            title : i18n.msg._("Newer Notebook"),
-            body : msg,
-            buttons : {
-                OK : {
-                    "class" : "btn-danger"
-                }
-            }
-        });
-    };
-
-    /**
-     * Set the dirty flag, and trigger the set_dirty.Notebook event
-     */
-    Notebook.prototype.set_dirty = function (value) {
-        if (value === undefined) {
-            value = true;
-        }
-        if (this.dirty === value) {
-            return;
-        }
-        this.events.trigger('set_dirty.Notebook', {value: value});
-    };
-
-    /**
-     * Scroll the top of the page to a given cell.
-     * 
-     * @param {integer}  index - An index of the cell to view
-     * @param {integer}  time - Animation time in milliseconds
-     * @return {integer} Pixel offset from the top of the container
-     */
-    Notebook.prototype.scroll_to_cell = function (index, time) {
-        return this.scroll_cell_percent(index, 0, time);
-    };
-
-    /**
-     * Scroll the middle of the page to a given cell.
-     *
-     * @param {integer}  index - An index of the cell to view
-     * @param {integer}  percent - 0-100, the location on the screen to scroll.
-     *                   0 is the top, 100 is the bottom.
-     * @param {integer}  time - Animation time in milliseconds
-     * @return {integer} Pixel offset from the top of the container
-     */
-    Notebook.prototype.scroll_cell_percent = function (index, percent, time) {
-        var cells = this.get_cells();
-        time = time || 0;
-        percent = percent || 0;
-        index = Math.min(cells.length-1,index);
-        index = Math.max(0             ,index);
-        var sme = this.scroll_manager.element;
-        var h = sme.height();
-        var st = sme.scrollTop();
-        var t = sme.offset().top;
-        var ct = cells[index].element.offset().top;
-        var scroll_value =  st + ct - (t + 0.01 * percent * h);
-        this.scroll_manager.element.animate({scrollTop:scroll_value}, time);
-        return scroll_value;
-    };
-
-    /**
-     * Scroll to the bottom of the page.
-     */
-    Notebook.prototype.scroll_to_bottom = function () {
-        this.scroll_manager.element.animate({scrollTop:this.element.get(0).scrollHeight}, 0);
-    };
-
-    /**
-     * Scroll to the top of the page.
-     */
-    Notebook.prototype.scroll_to_top = function () {
-        this.scroll_manager.element.animate({scrollTop:0}, 0);
-    };
-
-    // Edit Notebook metadata
-
-    /**
-     * Display a dialog that allows the user to edit the Notebook's metadata.
-     */
-    Notebook.prototype.edit_metadata = function () {
-        var that = this;
-        dialog.edit_metadata({
-            md: this.metadata, 
-            callback: function (new_md) {
-                if(!_.isEqual(that.metadata, new_md)){
-                    that.set_dirty(true);
-                }
-                that.metadata = new_md;
-            },
-            name: 'Notebook',
-            notebook: this,
-            keyboard_manager: this.keyboard_manager});
-    };
-
-    // Cell indexing, retrieval, etc.
-
-    /**
-     * Get all cell elements in the notebook.
-     * 
-     * @return {jQuery} A selector of all cell elements
-     */
-    Notebook.prototype.get_cell_elements = function () {
-        var container = this.container || $('#notebook-container');
-        return container.find(".cell").not('.cell .cell');
-    };
-
-    /**
-     * Get a particular cell element.
-     * 
-     * @param {integer} index An index of a cell to select
-     * @return {jQuery} A selector of the given cell.
-     */
-    Notebook.prototype.get_cell_element = function (index) {
-        var result = null;
-        var e = this.get_cell_elements().eq(index);
-        if (e.length !== 0) {
-            result = e;
-        }
-        return result;
-    };
-
-    /**
-     * Try to get a particular cell by msg_id.
-     * 
-     * @param {string} msg_id A message UUID
-     * @return {Cell} Cell or null if no cell was found.
-     */
-    Notebook.prototype.get_msg_cell = function (msg_id) {
-        return codecell.CodeCell.msg_cells[msg_id] || null;
-    };
-
-    /**
-     * Count the cells in this notebook.
-     * 
-     * @return {integer} The number of cells in this notebook
-     */
-    Notebook.prototype.ncells = function () {
-        return this.get_cell_elements().length;
-    };
-
-    /**
-     * Get all cell objects in this notebook.
-     * 
-     * @return {Array} This notebook's Cell objects
-     */
-    Notebook.prototype.get_cells = function () {
-        // TODO: we are often calling cells as cells()[i], which we should optimize
-        // to cells(i) or a new method.
-        return this.get_cell_elements().toArray().map(function (e) {
-            return $(e).data("cell");
-        });
-    };
-
-    /**
-     * Get a cell object from this notebook.
-     * 
-     * @param {integer} index - An index of a cell to retrieve
-     * @return {Cell} Cell or null if no cell was found.
-     */
-    Notebook.prototype.get_cell = function (index) {
-        var result = null;
-        var ce = this.get_cell_element(index);
-        if (ce !== null) {
-            result = ce.data('cell');
-        }
-        return result;
-    };
-
-    /**
-     * Get the cell below a given cell.
-     * 
-     * @param {Cell} cell
-     * @return {Cell} the next cell or null if no cell was found.
-     */
-    Notebook.prototype.get_next_cell = function (cell) {
-        var result = null;
-        var index = this.find_cell_index(cell);
-        if (this.is_valid_cell_index(index+1)) {
-            result = this.get_cell(index+1);
-        }
-        return result;
-    };
-    
-    /**
-     * Toggles the display of line numbers in all cells.
-     */
-    Notebook.prototype.toggle_all_line_numbers = function () {
-        this.line_numbers = !this.line_numbers;
-    };
-
-    /**
-     * Reads direction settings (LTR/RTL) from notebook/cells metadata
-     * and applies them to display elements.
-     */
-    Notebook.prototype.apply_directionality = function () {
-        var notebook_direction = this.metadata.direction || 'ltr';
-        // html
-        document.body.setAttribute('dir', notebook_direction);
-        // existing cells
-        this.get_cells().forEach( function(cell) {
-            if (cell.cell_type == 'markdown') {
-                cell.code_mirror.setOption('direction', cell.metadata.direction || notebook_direction);
-                cell.element.find('.rendered_html').attr('dir', cell.metadata.direction || notebook_direction);
-            } else if (cell.cell_type == 'code') {
-                cell.element.find('.output_text').attr('dir', cell.metadata.direction || 'auto');
-            }
-        });
-        // new cells
-        textcell.MarkdownCell.options_default.cm_config.direction = notebook_direction;
-    };
-
-    /**
-     * Get the cell above a given cell.
-     * 
-     * @param {Cell} cell
-     * @return {Cell} The previous cell or null if no cell was found.
-     */
-    Notebook.prototype.get_prev_cell = function (cell) {
-        var result = null;
-        var index = this.find_cell_index(cell);
-        if (index !== null && index > 0) {
-            result = this.get_cell(index-1);
-        }
-        return result;
-    };
-    
-    /**
-     * Get the numeric index of a given cell.
-     * 
-     * @param {Cell} cell
-     * @return {integer} The cell's numeric index or null if no cell was found.
-     */
-    Notebook.prototype.find_cell_index = function (cell) {
-        var result = null;
-        this.get_cell_elements().filter(function (index) {
-            if ($(this).data("cell") === cell) {
-                result = index;
-            }
-        });
-        return result;
-    };
-
-    /**
-     * Return given index if defined, or the selected index if not.
-     * 
-     * @param {integer} [index] - A cell's index
-     * @return {integer} cell index
-     */
-    Notebook.prototype.index_or_selected = function (index) {
-        var i;
-        if (index === undefined || index === null) {
-            i = this.get_selected_index();
-            if (i === null) {
-                i = 0;
-            }
-        } else {
-            i = index;
-        }
-        return i;
-    };
-
-    /**
-     * Get the selected cells.
-     * 
-     * @return {Cell} The selected cells or null if no cell was found.
-     */
-    Notebook.prototype.get_selected_cells = function () {
-        return this.get_cells().filter(function(cell, index){ return cell.selected || soft_selected(cell) || cell.anchor;});
-    };
-    
-     /**
-     * Get the selected cells.
-     * 
-     * @return {array} cell indicies
-     */
-    Notebook.prototype.get_selected_cells_indices = function () {
-        var result = [];
-        this.get_cells().filter(function (cell, index) {
-            if (cell.selected || soft_selected(cell) || cell.anchor) {
-                result.push(index);
-            }
-        });
-        return result;
-    };
-
-    /**
-     * Get the currently selected cell.
-     * 
-     * @return {Cell} The selected cell
-     */
-    Notebook.prototype.get_selected_cell = function () {
-        var index = this.get_selected_index();
-        return this.get_cell(index);
-    };
-
-    /**
-     * Check whether a cell index is valid.
-     * 
-     * @param {integer} index - A cell index
-     * @return True if the index is valid, false otherwise
-     */
-    Notebook.prototype.is_valid_cell_index = function (index) {
-        if (index !== null && index >= 0 && index < this.ncells()) {
-            return true;
-        } else {
-            return false;
-        }
-    };
-
-    /**
-     * Returns the index of the cell that the selection is currently anchored on.
-     *
-     * @return {integer} Index of first cell selected in selection
-     */
-    Notebook.prototype.get_anchor_index = function () {
-        var result = null;
-        this.get_cell_elements().filter(function (index) {
-            if ($(this).data("cell").anchor === true) {
-                result = index;
-            }
-        });
-        return result;
-    };
-
-    /**
-     * Get the index of the currently selected cell.
-     *
-     * @return {integer} The selected cell's numeric index
-     */
-    Notebook.prototype.get_selected_index = function () {
-        var result = null;
-        this.get_cell_elements().filter(function (index) {
-            if ($(this).data("cell").selected === true) {
-                result = index;
-            }
-        });
-        return result;
-    };
-
-
-    // Cell selection.
-
-    Notebook.prototype.extend_selection_by = function(delta) {
-        var index = this.get_selected_index();
-        // do not move anchor
-        return this.select(index+delta, false);
-    };
-
-
-    Notebook.prototype.update_soft_selection = function(){
-        var i1 = this.get_selected_index();
-        var i2 = this.get_anchor_index();
-        var low  = Math.min(i1, i2);
-        var high = Math.max(i1, i2);
-        this.get_cells().map(function(cell, index, all){
-            if( low <= index && index <= high && low !== high){
-                cell.element.addClass(_SOFT_SELECTION_CLASS);
-            } else {
-                cell.element.removeClass(_SOFT_SELECTION_CLASS);
-            }
-        });
-    };
-
-
-    Notebook.prototype.select_all = function(){
-        this.select(0, true);
-        this.select(this.ncells()-1, false);
-    };
-
-    Notebook.prototype._contract_selection = function(){
-        var i = this.get_selected_index();
-        this.select(i, true);
-    };
-
-    /**
-     * Programmatically select a cell.
-     * 
-     * @param {integer} index - A cell's index
-     * @param {boolean} moveanchor – whether to move the selection
-     *               anchor, default to true.
-     * @return {Notebook} This notebook
-     */
-    Notebook.prototype.select = function (index, moveanchor) {
-        moveanchor = (moveanchor===undefined)? true : moveanchor;
-
-        if (this.is_valid_cell_index(index)) {
-            var sindex = this.get_selected_index();
-            if (sindex !== null && index !== sindex) {
-                // If we are about to select a different cell, make sure we are
-                // first in command mode.
-                if (this.mode !== 'command') {
-                    this.command_mode();
-                }
-                this.get_cell(sindex).unselect(moveanchor);
-            }
-            if(moveanchor){
-                this.get_cell(this.get_anchor_index()).unselect(moveanchor);
-            }
-            var cell = this.get_cell(index);
-            cell.select(moveanchor);
-            this.update_soft_selection();
-            if (cell.cell_type === 'heading') {
-                this.events.trigger('selected_cell_type_changed.Notebook',
-                    {
-                        'cell_type': cell.cell_type,
-                        'level': cell.level,
-                        'editable': cell.is_editable()
-                    }
-                );
-            } else {
-                this.events.trigger('selected_cell_type_changed.Notebook',
-                    {
-                        'cell_type': cell.cell_type,
-                        'editable': cell.is_editable()
-                    }
-                );
-            }
-        }
-        return this;
-    };
-
-    /**
-     * Programmatically select the next cell.
-     *
-     * @param {bool} moveanchor – whether to move the selection
-     *               anchor, default to true.
-     * @return {Notebook} This notebook
-     */
-    Notebook.prototype.select_next = function (moveanchor) {
-        var index = this.get_selected_index();
-        this.select(index+1, moveanchor);
-        return this;
-    };
-
-    /**
-     * Programmatically select the previous cell.
-     *
-     * @return {Notebook} This notebook
-     */
-    Notebook.prototype.select_prev = function (moveanchor) {
-        var index = this.get_selected_index();
-        this.select(index-1, moveanchor);
-        return this;
-    };
-
-
-    // Edit/Command mode
-
-    /**
-     * Gets the index of the cell that is in edit mode.
-     *
-     * @return {integer} index
-     */
-    Notebook.prototype.get_edit_index = function () {
-        var result = null;
-        this.get_cell_elements().filter(function (index) {
-            if ($(this).data("cell").mode === 'edit') {
-                result = index;
-            }
-        });
-        return result;
-    };
-
-    /**
-     * Handle when a a cell blurs and the notebook should enter command mode.
-     *
-     * @param {Cell} [cell] - Cell to enter command mode on.
-     */
-    Notebook.prototype.handle_command_mode = function (cell) {
-        if (this.mode !== 'command') {
-            cell.command_mode();
-            this.mode = 'command';
-            this.events.trigger('command_mode.Notebook');
-            this.keyboard_manager.command_mode();
-        }
-    };
-
-    /**
-     * Make the notebook enter command mode.
-     */
-    Notebook.prototype.command_mode = function () {
-        var cell = this.get_cell(this.get_edit_index());
-        if (cell && this.mode !== 'command') {
-            // We don't call cell.command_mode, but rather blur the CM editor
-            // which will trigger the call to handle_command_mode.
-            cell.code_mirror.getInputField().blur();
-        }
-    };
-
-    /**
-     * Handle when a cell fires it's edit_mode event.
-     *
-     * @param {Cell} [cell] Cell to enter edit mode on.
-     */
-    Notebook.prototype.handle_edit_mode = function (cell) {
-        this._contract_selection();
-        if (cell && this.mode !== 'edit') {
-            cell.edit_mode();
-            this.mode = 'edit';
-            this.events.trigger('edit_mode.Notebook');
-            this.keyboard_manager.edit_mode();
-        }
-    };
-
-    /**
-     * Make a cell enter edit mode.
-     */
-    Notebook.prototype.edit_mode = function () {
-        this._contract_selection();
-        var cell = this.get_selected_cell();
-        if (cell && this.mode !== 'edit') {
-            cell.unrender();
-            cell.focus_editor();
-        }
-    };
-    
-    /**
-     * Ensure either cell or codemirror is focused. If none 
-     * is focused, focus the cell.
-     */
-    Notebook.prototype.ensure_focused = function(){
-        var cell = this.get_selected_cell();
-        if (cell === null) {return;}  // No cell is selected
-        cell.ensure_focused();
-    };
-
-    /**
-     * Focus the currently selected cell.
-     */
-    Notebook.prototype.focus_cell = function () {
-        var cell = this.get_selected_cell();
-        if (cell === null) {return;}  // No cell is selected
-        cell.focus_cell();
-    };
-
-    // Cell movement
-
-    /**
-     * Move the current selection up, keeping the same cells selected
-     * No op if the selection is at the beginning of the notebook
-     */
-    Notebook.prototype.move_selection_up = function(){
-        // actually will move the cell before the selection, after the selection
-        var indices = this.get_selected_cells_indices();
-        var first = indices[0];
-        var last = indices[indices.length - 1];
-
-        var selected = this.get_selected_index();
-        var anchored = this.get_anchor_index();
-
-        if (first === 0){
-            return;
-        }
-        var tomove = this.get_cell_element(first - 1);
-        var pivot = this.get_cell_element(last);
-
-        tomove.detach();
-        pivot.after(tomove);
-
-        this.get_cell(selected-1).focus_cell();
-        this.select(anchored - 1);
-        this.select(selected - 1, false);
-    };
-
-    /**
-     * Move the current selection down, keeping the same cells selected.
-     * No op if the selection is at the end of the notebook
-     */
-    Notebook.prototype.move_selection_down = function(){
-        // actually will move the cell after the selection, before the selection
-        var indices = this.get_selected_cells_indices();
-        var first = indices[0];
-        var last = indices[indices.length - 1];
-
-        var selected = this.get_selected_index();
-        var anchored = this.get_anchor_index();
-
-        if(!this.is_valid_cell_index(last + 1)){
-            return;
-        }
-        var tomove = this.get_cell_element(last + 1);
-        var pivot = this.get_cell_element(first);
-
-        tomove.detach();
-        pivot.before(tomove);
-
-        this.get_cell(selected+1).focus_cell();
-        this.select(first);
-        this.select(anchored + 1);
-        this.select(selected + 1, false);
-    };
-
-    /**
-     * Move given (or selected) cell up and select it.
-     * 
-     * @param {integer} [index] - cell index
-     * @return {Notebook} This notebook
-     */
-    Notebook.prototype.move_cell_up = function (index) {
-        console.warn('Notebook.move_cell_up is deprecated as of v4.1 and will be removed in v5.0');
-
-        if(index === undefined){
-            this.move_selection_up();
-            return this;
-        }
-        
-        var i = this.index_or_selected(index);
-        if (this.is_valid_cell_index(i) && i > 0) {
-            var pivot = this.get_cell_element(i-1);
-            var tomove = this.get_cell_element(i);
-            if (pivot !== null && tomove !== null) {
-                tomove.detach();
-                pivot.before(tomove);
-                this.select(i-1);
-                var cell = this.get_selected_cell();
-                cell.focus_cell();
-            }
-            this.set_dirty(true);
-        }
-        return this;
-    };
-
-
-    /**
-     * Move given (or selected) cell down and select it.
-     * 
-     * @param {integer} [index] - cell index
-     * @return {Notebook} This notebook
-     */
-    Notebook.prototype.move_cell_down = function (index) {
-        console.warn('Notebook.move_cell_down is deprecated as of v4.1 and will be removed in v5.0');
-
-        if(index === undefined){
-            this.move_selection_down();
-            return this;
-        }
-        
-        var i = this.index_or_selected(index);
-        if (this.is_valid_cell_index(i) && this.is_valid_cell_index(i+1)) {
-            var pivot = this.get_cell_element(i+1);
-            var tomove = this.get_cell_element(i);
-            if (pivot !== null && tomove !== null) {
-                tomove.detach();
-                pivot.after(tomove);
-                this.select(i+1);
-                var cell = this.get_selected_cell();
-                cell.focus_cell();
-            }
-        }
-        this.set_dirty();
-        return this;
-    };
-
-
-    // Insertion, deletion.
-
-    /**
-     * Delete a cell from the notebook without any precautions
-     * Needed to reload checkpoints and other things like that.
-     * 
-     * @param {integer} [index] - cell's numeric index
-     * @return {Notebook} This notebook
-     */
-    Notebook.prototype._unsafe_delete_cell = function (index) {
-        var i = this.index_or_selected(index);
-        var cell = this.get_cell(i);
-
-        $('#undelete_cell').addClass('disabled');
-        $('#undelete_cell > a').attr('aria-disabled','true');
-        if (this.is_valid_cell_index(i)) {
-            var old_ncells = this.ncells();
-            var ce = this.get_cell_element(i);
-            ce.remove();
-            this.set_dirty(true);
-        }
-        return this;
-    };
-
-
-    /**
-     * Delete cells from the notebook
-     *
-     * @param {Array} [indices] - the numeric indices of cells to delete.
-     * @return {Notebook} This notebook
-     */
-    Notebook.prototype.delete_cells = function(indices) {
-        if (indices === undefined) {
-            indices = this.get_selected_cells_indices();
-        }
-
-        var undelete_backup = {
-            cells: [],
-            below: false,
-            index: 0,
-        };
-
-        var cursor_ix_before = this.get_selected_index();
-        var deleting_before_cursor = 0;
-        for (var i=0; i < indices.length; i++) {
-            if (!this.get_cell(indices[i]).is_deletable()) {
-                // If any cell is marked undeletable, cancel
-                return this;
-            }
-
-            if (indices[i] < cursor_ix_before) {
-                deleting_before_cursor++;
-            }
-        }
-
-        // If we started deleting cells from the top, the later indices would
-        // get offset. We sort them into descending order to avoid that.
-        indices.sort(function(a, b) {return b-a;});
-        for (i=0; i < indices.length; i++) {
-            var cell = this.get_cell(indices[i]);
-            undelete_backup.cells.push(cell.toJSON());
-            this.get_cell_element(indices[i]).remove();
-            this.events.trigger('delete.Cell', {'cell': cell, 'index': indices[i]});
-        }
-
-        var new_ncells = this.ncells();
-        // Always make sure we have at least one cell.
-        if (new_ncells === 0) {
-            this.insert_cell_below('code');
-            new_ncells = 1;
-        }
-
-        var cursor_ix_after = this.get_selected_index();
-        if (cursor_ix_after === null) {
-            // Selected cell was deleted
-            cursor_ix_after = cursor_ix_before - deleting_before_cursor;
-            if (cursor_ix_after >= new_ncells) {
-                cursor_ix_after = new_ncells - 1;
-                undelete_backup.below = true;
-            }
-            this.select(cursor_ix_after);
-        }
-
-        // Check if the cells were after the cursor
-        for (i=0; i < indices.length; i++) {
-            if (indices[i] > cursor_ix_before) {
-                undelete_backup.below = true;
-            }
-        }
-
-        // This will put all the deleted cells back in one location, rather than
-        // where they came from. It will do until we have proper undo support.
-        undelete_backup.index = cursor_ix_after;
-        $('#undelete_cell').removeClass('disabled');
-        $('#undelete_cell > a').attr('aria-disabled','false');
-        this.undelete_backup_stack.push(undelete_backup);
-        this.set_dirty(true);
-
-        return this;
-    };
-
-    /**
-     * Delete a cell from the notebook.
-     * 
-     * @param {integer} [index] - cell's numeric index
-     * @return {Notebook} This notebook
-     */
-    Notebook.prototype.delete_cell = function (index) {
-        if (index === undefined) {
-            return this.delete_cells();
-        } else {
-            return this.delete_cells([index]);
-        }
-    };
-
-    /**
-     * Restore the most recently deleted cells.
-     */
-    Notebook.prototype.undelete_cell = function() {
-        if (this.undelete_backup_stack.length > 0) {
-            var undelete_backup = this.undelete_backup_stack.pop();
-            var i, cell_data, new_cell, insert;
-            if (undelete_backup.below) {
-                insert = $.proxy(this.insert_cell_below, this);
-            } else {
-                insert = $.proxy(this.insert_cell_above, this);
-            }
-            for (i=0; i < undelete_backup.cells.length; i++) {
-                cell_data = undelete_backup.cells[i];
-                new_cell = insert(cell_data.cell_type, undelete_backup.index);
-                new_cell.fromJSON(cell_data);
-            }
-
-            this.set_dirty(true);
-        }
-        if (this.undelete_backup_stack.length === 0) {
-            $('#undelete_cell').addClass('disabled');
-            $('#undelete_cell > a').attr('aria-disabled','true');
-        }
-    };
-
-    /**
-     * Insert a cell so that after insertion the cell is at given index.
-     *
-     * If cell type is not provided, it will default to the type of the
-     * currently active cell.
-     *
-     * Similar to insert_above, but index parameter is mandatory.
-     *
-     * Index will be brought back into the accessible range [0,n].
-     *
-     * @param {string} [type] - in ['code','markdown', 'raw'], defaults to 'code'
-     * @param {integer} [index] - a valid index where to insert cell
-     * @return {Cell|null} created cell or null
-     */
-    Notebook.prototype.insert_cell_at_index = function(type, index){
-
-        var ncells = this.ncells();
-        index = Math.min(index, ncells);
-        index = Math.max(index, 0);
-        var cell = null;
-        type = type || this.class_config.get_sync('default_cell_type');
-        if (type === 'above') {
-            if (index > 0) {
-                type = this.get_cell(index-1).cell_type;
-            } else {
-                type = 'code';
-            }
-        } else if (type === 'below') {
-            if (index < ncells) {
-                type = this.get_cell(index).cell_type;
-            } else {
-                type = 'code';
-            }
-        } else if (type === 'selected') {
-            type = this.get_selected_cell().cell_type;
-        }
-
-        if (ncells === 0 || this.is_valid_cell_index(index) || index === ncells) {
-            var cell_options = {
-                events: this.events, 
-                config: this.config, 
-                keyboard_manager: this.keyboard_manager, 
-                notebook: this,
-                tooltip: this.tooltip
-            };
-            switch(type) {
-            case 'code':
-                cell = new codecell.CodeCell(this.kernel, cell_options);
-                cell.set_input_prompt();
-                break;
-            case 'markdown':
-                cell = new textcell.MarkdownCell(cell_options);
-                break;
-            case 'raw':
-                cell = new textcell.RawCell(cell_options);
-                break;
-            default:
-                console.log("Unrecognized cell type: ", type, cellmod);
-                cell = new cellmod.UnrecognizedCell(cell_options);
-            }
-
-            if(this._insert_element_at_index(cell.element,index)) {
-                cell.render();
-                this.events.trigger('create.Cell', {'cell': cell, 'index': index});
-                cell.refresh();
-                // We used to select the cell after we refresh it, but there
-                // are now cases were this method is called where select is
-                // not appropriate. The selection logic should be handled by the
-                // caller of the the top level insert_cell methods.
-                this.set_dirty(true);
-            }
-        }
-        return cell;
-
-    };
-
-    /**
-     * Insert an element at given cell index.
-     *
-     * @param {HTMLElement} element - a cell element
-     * @param {integer}     [index] - a valid index where to inser cell
-     * @returns {boolean}   success
-     */
-    Notebook.prototype._insert_element_at_index = function(element, index){
-        if (element === undefined){
-            return false;
-        }
-
-        var ncells = this.ncells();
-
-        if (ncells === 0) {
-            // special case append if empty
-            this.container.append(element);
-        } else if ( ncells === index ) {
-            // special case append it the end, but not empty
-            this.get_cell_element(index-1).after(element);
-        } else if (this.is_valid_cell_index(index)) {
-            // otherwise always somewhere to append to
-            this.get_cell_element(index).before(element);
-        } else {
-            return false;
-        }
-        
-        this.undelete_backup_stack.map(function (undelete_backup) {
-            if (index < undelete_backup.index) {
-                undelete_backup.index += 1;
-            }
-        });
-        this.set_dirty(true);
-        return true;
-    };
-
-    /**
-     * Insert a cell of given type above given index, or at top
-     * of notebook if index smaller than 0.
-     *
-     * @param {string}     [type] - cell type
-     * @param {integer}    [index] - defaults to the currently selected cell
-     * @return {Cell|null} handle to created cell or null
-     */
-    Notebook.prototype.insert_cell_above = function (type, index) {
-        if (index === null || index === undefined) {
-            index = Math.min(this.get_selected_index(index), this.get_anchor_index());
-        }
-        return this.insert_cell_at_index(type, index);
-    };
-
-    /**
-     * Insert a cell of given type below given index, or at bottom
-     * of notebook if index greater than number of cells
-     *
-     * @param {string}     [type] - cell type
-     * @param {integer}    [index] - defaults to the currently selected cell
-     * @return {Cell|null} handle to created cell or null
-     */
-    Notebook.prototype.insert_cell_below = function (type, index) {
-        if (index === null || index === undefined) {            
-            index = Math.max(this.get_selected_index(index), this.get_anchor_index());
-        }
-        return this.insert_cell_at_index(type, index+1);
-    };
-
-
-    /**
-     * Insert cell at end of notebook
-     *
-     * @param {string} type - cell type
-     * @return {Cell|null} handle to created cell or null
-     */
-    Notebook.prototype.insert_cell_at_bottom = function (type){
-        var len = this.ncells();
-        return this.insert_cell_below(type,len-1);
-    };
-
-    /**
-     * Transfer contents from one cell to a new type cell
-     */
-    Notebook.prototype.transfer_to_new_cell = function (source_cell, target_cell){
-        var text = source_cell.get_text();
-
-        if (text === source_cell.placeholder) {
-            text = '';
-        }
-        // metadata
-        target_cell.metadata = source_cell.metadata;
-        target_cell.attachments = source_cell.attachments;
-
-        // We must show the editor before setting its contents
-        target_cell.unrender();
-        target_cell.set_text(text);
-        // make this value the starting point, so that we can only undo
-        // to this state, instead of a blank cell
-        target_cell.code_mirror.clearHistory();
-        source_cell.element.remove();
-    }
-    
-    /**
-     * Turn one or more cells into code.
-     *
-     * @param {Array} indices - cell indices to convert
-     */
-    Notebook.prototype.cells_to_code = function (indices) {
-        if (indices === undefined){
-            indices = this.get_selected_cells_indices();
-        }
-        
-        for (var i=0; i <indices.length; i++){
-            this.to_code(indices[i]);
-        }
-    };
-
-    /**
-     * Turn a cell into a code cell.
-     * 
-     * @param {integer} [index] - cell index
-     */
-    Notebook.prototype.to_code = function (index) {
-        var i = this.index_or_selected(index);
-        if (this.is_valid_cell_index(i)) {
-            var source_cell = this.get_cell(i);
-            if (!(source_cell instanceof codecell.CodeCell) && source_cell.is_editable()) {
-                var target_cell = this.insert_cell_below('code',i);
-                var text = source_cell.get_text();
-                if (text === source_cell.placeholder) {
-                    text = '';
-                }
-                //metadata
-                target_cell.metadata = source_cell.metadata;
-                // attachments (we transfer them so they aren't lost if the
-                // cell is turned back into markdown)
-                target_cell.attachments = source_cell.attachments;
-
-                target_cell.set_text(text);
-                // make this value the starting point, so that we can only undo
-                // to this state, instead of a blank cell
-                target_cell.code_mirror.clearHistory();
-                source_cell.element.remove();
-                this.select(i);
-                var cursor = source_cell.code_mirror.getCursor();
-                target_cell.code_mirror.setCursor(cursor);
-                this.set_dirty(true);
-            }
-        }
-    };
-
-    /**
-     * Turn one or more cells into Markdown.
-     *
-     * @param {Array} indices - cell indices to convert
-     */
-     Notebook.prototype.cells_to_markdown = function (indices) {
-        if (indices === undefined) {
-            indices = this.get_selected_cells_indices();
-        }
-
-        for(var i=0; i < indices.length; i++) {
-            this.to_markdown(indices[i]);
-        }
-     };
-
-    /**
-     * Turn a cell into a Markdown cell.
-     * 
-     * @param {integer} [index] - cell index
-     */
-    Notebook.prototype.to_markdown = function (index) {
-        var i = this.index_or_selected(index);
-        if (this.is_valid_cell_index(i)) {
-            var source_cell = this.get_cell(i);
-
-            if (!(source_cell instanceof textcell.MarkdownCell) && source_cell.is_editable()) {
-                var target_cell = this.insert_cell_below('markdown',i);
-
-                this.transfer_to_new_cell(source_cell, target_cell);
-                this.select(i);
-
-                if ((source_cell instanceof textcell.TextCell) && source_cell.rendered) {
-                    target_cell.render();
-                }
-                var cursor = source_cell.code_mirror.getCursor();
-                target_cell.code_mirror.setCursor(cursor);
-                this.set_dirty(true);
-            }
-        }
-    };
-
-    /**
-     * Turn one or more cells into a raw text cell.
-     *
-     * @param {Array} indices - cell indices to convert
-     */
-     Notebook.prototype.cells_to_raw = function (indices) {
-        if (indices === undefined) {
-            indices = this.get_selected_cells_indices();
-        }
-
-        for(var i=0; i < indices.length; i++) {
-            this.to_raw(indices[i]);
-        }
-     };
-
-    /**
-     * Turn a cell into a raw text cell.
-     * 
-     * @param {integer} [index] - cell index
-     */
-    Notebook.prototype.to_raw = function (index) {
-        var i = this.index_or_selected(index);
-        if (this.is_valid_cell_index(i)) {
-            var target_cell = null;
-            var source_cell = this.get_cell(i);
-
-            if (!(source_cell instanceof textcell.RawCell) && source_cell.is_editable()) {
-                target_cell = this.insert_cell_below('raw',i);
-                
-                this.transfer_to_new_cell(source_cell, target_cell);
-                this.select(i);
-                
-                var cursor = source_cell.code_mirror.getCursor();
-                target_cell.code_mirror.setCursor(cursor);
-                this.set_dirty(true);
-            }
-        }
-    };
-    
-    /**
-     * Warn about heading cell support removal.
-     */
-    Notebook.prototype._warn_heading = function () {
-        dialog.modal({
-            notebook: this,
-            keyboard_manager: this.keyboard_manager,
-            title : i18n.msg._("Use markdown headings"),
-            body : $("<p/>").text(
-                i18n.msg._('Jupyter no longer uses special heading cells. ' + 
-                'Instead, write your headings in Markdown cells using # characters:')
-            ).append($('<pre/>').text(
-                i18n.msg._('## This is a level 2 heading')
-            )),
-            buttons : {
-                "OK" : {}
-            }
-        });
-    };
-    
-    /**
-     * Turn a cell into a heading containing markdown cell.
-     * 
-     * @param {integer} [index] - cell index
-     * @param {integer} [level] - heading level (e.g., 1 for h1)
-     */
-    Notebook.prototype.to_heading = function (index, level) {
-        this.to_markdown(index);
-        level = level || 1;
-        var i = this.index_or_selected(index);
-        if (this.is_valid_cell_index(i)) {
-            var cell = this.get_cell(i);
-            cell.set_heading_level(level);
-            this.set_dirty(true);
-        }
-    };
-
-
-    // Cut/Copy/Paste
-
-    /**
-     * Enable the UI elements for pasting cells.
-     */
-    Notebook.prototype.enable_paste = function () {
-        var that = this;
-        if (!this.paste_enabled) {
-            $('#paste_cell_replace').removeClass('disabled')
-            $('#paste_cell_replace > a').attr('aria-disabled', 'false');
-            $('#paste_cell_above').removeClass('disabled')
-            $('#paste_cell_above > a').attr('aria-disabled', 'false');
-            $('#paste_cell_below').removeClass('disabled')
-            $('#paste_cell_below > a').attr('aria-disabled', 'false');
-            this.paste_enabled = true;
-        }
-    };
-
-    /**
-     * Disable the UI elements for pasting cells.
-     */
-    Notebook.prototype.disable_paste = function () {
-        if (this.paste_enabled) {
-            $('#paste_cell_replace').addClass('disabled');
-            $('#paste_cell_replace > a').attr('aria-disabled', 'true');
-            $('#paste_cell_above').addClass('disabled');
-            $('#paste_cell_above > a').attr('aria-disabled', 'true');
-            $('#paste_cell_below').addClass('disabled');
-            $('#paste_cell_below > a').attr('aria-disabled', 'true');
-            this.paste_enabled = false;
-        }
-    };
-
-    /**
-     * Cut a cell.
-     */
-    Notebook.prototype.cut_cell = function () {
-        this.copy_cell();
-        this.delete_cell();
-    };
-
-    /**
-     * Copy cells.
-     */
-    Notebook.prototype.copy_cell = function () {
-        var cells = this.get_selected_cells();
-        if (cells.length === 0) {
-            cells = [this.get_selected_cell()];
-        }
-        
-        this.clipboard = [];
-        var cell_json;
-        for (var i=0; i < cells.length; i++) {
-            cell_json = cells[i].toJSON();
-            if (cell_json.metadata.deletable !== undefined) {
-                delete cell_json.metadata.deletable;
-            }
-            if (cell_json.id !== undefined) {
-                delete cell_json.id;
-            }
-            this.clipboard.push(cell_json);
-        }
-        this.enable_paste();
-    };
-
-    /**
-     * Replace the selected cell with the cells in the clipboard.
-     */
-    Notebook.prototype.paste_cell_replace = function () {
-
-        if (!(this.clipboard !== null && this.paste_enabled)) {
-            return;
-        }
-
-        var selected =  this.get_selected_cells_indices();
-        var insertion_index = selected[0];
-        this.delete_cells(selected);
-
-        for (var i=this.clipboard.length-1; i >= 0; i--) {
-            var cell_data = this.clipboard[i];
-            var new_cell = this.insert_cell_at_index(cell_data.cell_type, insertion_index);
-            new_cell.fromJSON(cell_data);
-        }
-
-        this.select(insertion_index+this.clipboard.length-1);
-    };
-
-    /**
-     * Paste cells from the clipboard above the selected cell.
-     */
-    Notebook.prototype.paste_cell_above = function () {
-        if (this.clipboard !== null && this.paste_enabled) {
-            var first_inserted = null;
-            for (var i=0; i < this.clipboard.length; i++) {
-                var cell_data = this.clipboard[i];
-                var new_cell = this.insert_cell_above(cell_data.cell_type);
-                new_cell.fromJSON(cell_data);
-                if (first_inserted === null) {
-                    first_inserted = new_cell;
-                }
-            }
-            first_inserted.focus_cell();
-        }
-    };
-
-    /**
-     * Paste cells from the clipboard below the selected cell.
-     */
-    Notebook.prototype.paste_cell_below = function () {
-        if (this.clipboard !== null && this.paste_enabled) {
-            var first_inserted = null;
-            for (var i = this.clipboard.length-1; i >= 0; i--) {
-                var cell_data = this.clipboard[i];
-                var new_cell = this.insert_cell_below(cell_data.cell_type);
-                new_cell.fromJSON(cell_data);
-                if (first_inserted === null) {
-                    first_inserted = new_cell;
-                }
-            }
-            first_inserted.focus_cell();
-        }
-    };
-    
-    /**
-     * Re-render the output of a code cell.
-     */
-    Notebook.prototype.render_cell_output = function (code_cell) {
-        var cell_data = code_cell.toJSON();
-        var cell_index = this.find_cell_index(code_cell);
-        var trusted = code_cell.output_area.trusted;
-        this.clear_output(cell_index);
-        code_cell.output_area.trusted = trusted;
-        code_cell.fromJSON(cell_data);
-    };
-
-    // Split/merge
-
-    /**
-     * Split the selected cell into two cells.
-     */
-    Notebook.prototype.split_cell = function () {
-        var cell = this.get_selected_cell();
-        if (cell.is_splittable()) {
-            var text_list = cell.get_split_text();
-            for (var i = 0; i < text_list.length-1; i++) {
-                // Create new cell with same type
-                var new_cell = this.insert_cell_above(cell.cell_type);
-                // Unrender the new cell so we can call set_text.
-                new_cell.unrender();
-                new_cell.set_text(text_list[i]);
-                // Duplicate metadata
-                new_cell.metadata = JSON.parse(JSON.stringify(cell.metadata));
-            }
-            // Original cell becomes the last one
-            // so we don't need to worry about selection
-            cell.set_text(text_list[text_list.length-1]);
-        }
-    };
-
-    /**
-     * Merge a series of cells into one
-     *
-     * @param {Array} indices - the numeric indices of the cells to be merged
-     * @param {boolean} into_last - merge into the last cell instead of the first
-     */
-    Notebook.prototype.merge_cells = function(indices, into_last) {
-        if (indices.length <= 1) {
-            return;
-        }
-
-        // Check if trying to merge above on topmost cell or wrap around
-        // when merging above, see #330
-        if (indices.filter(function(item) {return item < 0;}).length > 0) {
-            return;
-        }
-
-        for (var i=0; i < indices.length; i++) {
-            if (!this.get_cell(indices[i]).is_mergeable()) {
-                return;
-            }
-        }
-        var target = this.get_cell(into_last ? indices.pop() : indices.shift());
-
-        // Get all the cells' contents
-        var contents = [];
-        for (i=0; i < indices.length; i++) {
-            contents.push(this.get_cell(indices[i]).get_text());
-        }
-        if (into_last) {
-            contents.push(target.get_text());
-        } else {
-            contents.unshift(target.get_text());
-        }
-
-        // Update the contents of the target cell
-        if (target instanceof codecell.CodeCell) {
-            target.set_text(contents.join('\n\n'));
-        } else {
-            var was_rendered = target.rendered;
-            target.unrender(); // Must unrender before we set_text.
-            target.set_text(contents.join('\n\n'));
-            if (was_rendered) {
-                // The rendered state of the final cell should match
-                // that of the original selected cell;
-                target.render();
-            }
-        }
-
-        // Delete the other cells
-        this.delete_cells(indices);
-        
-        // Reset the target cell's undo history
-        target.code_mirror.clearHistory();
-
-        this.select(this.find_cell_index(target));
-    };
-
-    /**
-     * Merge the selected range of cells
-     */
-    Notebook.prototype.merge_selected_cells = function() {
-        this.merge_cells(this.get_selected_cells_indices());
-    };
-
-    /**
-     * Merge the selected cell into the cell above it.
-     */
-    Notebook.prototype.merge_cell_above = function () {
-        var index = this.get_selected_index();
-        this.merge_cells([index-1, index], true);
-    };
-
-    /**
-     * Merge the selected cell into the cell below it.
-     */
-    Notebook.prototype.merge_cell_below = function () {
-        var index = this.get_selected_index();
-        this.merge_cells([index, index+1], false);
-    };
-
-    // Attachments handling
-
-    /**
-     * Shows a dialog letting the user pick an image from her computer and
-     * insert it into the edited markdown cell
-     */
-    Notebook.prototype.insert_image = function () {
-        var that = this;
-        var cell = this.get_selected_cell();
-        // The following should not happen as the menu item is greyed out
-        // when those conditions are not fulfilled (see MarkdownCell
-        // unselect/select/unrender handlers)
-        if (cell.cell_type !== 'markdown') {
-            console.log('Error: insert_image called on non-markdown cell');
-            return;
-        }
-        if (cell.rendered) {
-            console.log('Error: insert_image called on rendered cell');
-            return;
-        }
-        dialog.insert_image({
-            callback: function(file) {
-                cell.edit_mode();
-                cell.insert_inline_image_from_blob(file);
-            },
-            notebook: this,
-            keyboard_manager: this.keyboard_manager
-        });
-    };
-
-    /**
-     * Cut the attachments of a cell
-     */
-    Notebook.prototype.cut_cell_attachments = function() {
-        var cell = this.get_selected_cell();
-        if (cell.attachments !== undefined) {
-            this.clipboard_attachments = cell.attachments;
-            this.enable_attachments_paste();
-            delete cell.attachments;
-            cell.unrender();
-            cell.render();
-        }
-    };
-
-    /**
-     * Copy the attachments of a cell
-     */
-    Notebook.prototype.copy_cell_attachments = function() {
-        var cell = this.get_selected_cell();
-        if (cell.attachments !== undefined) {
-          // Do a deep copy of attachments to avoid subsequent modification
-          // to the cell to modify the clipboard
-          this.clipboard_attachments = $.extend(true, {}, cell.attachments);
-          this.enable_attachments_paste();
-        }
-    };
-
-    /**
-     * Paste the attachments in the clipboard into the currently selected
-     * cell
-     */
-    Notebook.prototype.paste_cell_attachments = function() {
-        if (this.clipboard_attachments !== null &&
-            this.paste_attachments_enabled) {
-            var cell = this.get_selected_cell();
-            if (cell.attachments === undefined) {
-              cell.attachments = {};
-            }
-            // Do a deep copy so we can paste multiple times
-            $.extend(true, cell.attachments, this.clipboard_attachments);
-            cell.unrender();
-            cell.render();
-        }
-    };
-
-    /**
-     * Disable the "Paste Cell Attachments" menu item
-     */
-    Notebook.prototype.disable_attachments_paste = function () {
-        if (this.paste_attachments_enabled) {
-            $('#paste_cell_attachments').addClass('disabled');
-            $('#paste_cell_attachments > a').attr('disabled','true');
-            this.paste_attachments_enabled = false;
-        }
-    };
-
-    /**
-     * Enable the "Paste Cell Attachments" menu item
-     */
-    Notebook.prototype.enable_attachments_paste = function () {
-        if (!this.paste_attachments_enabled) {
-            $('#paste_cell_attachments').removeClass('disabled');
-            $('#paste_cell_attachments > a').attr('aria-disabled','false');
-            this.paste_attachments_enabled = true;
-        }
-    };
-
-    /**
-     * Enable/disable the "Insert image" menu item
-     */
-    Notebook.prototype.set_insert_image_enabled = function(enabled) {
-        if (enabled) {
-            $('#insert_image').removeClass('disabled');
-            $('#insert_image > a').attr('aria-disabled', 'false');
-        } else {
-            $('#insert_image').addClass('disabled');
-            $('#insert_image > a').attr('aria-disabled', 'true');
-        }
-    };
-
-    // Cell collapsing and output clearing
-
-    /**
-     * Hide a cell's output.
-     * 
-     * @param {integer} index - cell index
-     */
-    Notebook.prototype.collapse_output = function (index) {
-        var i = this.index_or_selected(index);
-        var cell = this.get_cell(i);
-        if (cell !== null && (cell instanceof codecell.CodeCell)) {
-            cell.collapse_output();
-            this.set_dirty(true);
-        }
-    };
-
-    /**
-     * Hide each code cell's output area.
-     */
-    Notebook.prototype.collapse_all_output = function () {
-        this.get_cells().map(function (cell) {
-            if (cell instanceof codecell.CodeCell) {
-                cell.collapse_output();
-            }
-        });
-        // this should not be set if the `collapse` key is removed from nbformat
-        this.set_dirty(true);
-    };
-
-    /**
-     * Show a cell's output.
-     * 
-     * @param {integer} index - cell index
-     */
-    Notebook.prototype.expand_output = function (index) {
-        var i = this.index_or_selected(index);
-        var cell = this.get_cell(i);
-        if (cell !== null && (cell instanceof codecell.CodeCell)) {
-            cell.expand_output();
-            this.set_dirty(true);
-        }
-    };
-
-    /**
-     * Expand each code cell's output area, and remove scrollbars.
-     */
-    Notebook.prototype.expand_all_output = function () {
-        this.get_cells().map(function (cell) {
-            if (cell instanceof codecell.CodeCell) {
-                cell.expand_output();
-            }
-        });
-        // this should not be set if the `collapse` key is removed from nbformat
-        this.set_dirty(true);
-    };
-
-    /**
-     * Clear a code cell's output area.
-     * 
-     * @param {integer} index - cell index
-     */
-    Notebook.prototype.clear_output = function (index) {
-        var i = this.index_or_selected(index);
-        var cell = this.get_cell(i);
-        if (cell !== null && (cell instanceof codecell.CodeCell)) {
-            cell.clear_output();
-            this.set_dirty(true);
-        }
-    };
-
-    /**
-     * Clear multiple selected code cells' output areas.
-     *
-     */
-    Notebook.prototype.clear_cells_outputs = function(indices) {
-        if (!indices) {
-           indices = this.get_selected_cells_indices();
-        }
-
-        for (var i = 0; i < indices.length; i++){
-            this.clear_output(indices[i]);
-        }
-    };
-
-    /**
-     * Clear each code cell's output area.
-     */
-    Notebook.prototype.clear_all_output = function () {
-        this.get_cells().map(function (cell) {
-            if (cell instanceof codecell.CodeCell) {
-                cell.clear_output();
-            }
-        });
-        this.set_dirty(true);
-    };
-
-    /**
-     * Scroll the selected CodeCell's output area.
-     * 
-     * @param {integer} index - cell index
-     */
-    Notebook.prototype.scroll_output = function (index) {
-        var i = this.index_or_selected(index);
-        var cell = this.get_cell(i);
-        if (cell !== null && (cell instanceof codecell.CodeCell)) {
-            cell.scroll_output();
-            this.set_dirty(true);
-        }
-    };
-
-    /**
-     * Expand each code cell's output area and add a scrollbar for long output.
-     */
-    Notebook.prototype.scroll_all_output = function () {
-        this.get_cells().map(function (cell, i) {
-            if (cell instanceof codecell.CodeCell) {
-                cell.scroll_output();
-            }
-        });
-        // this should not be set if the `collapse` key is removed from nbformat
-        this.set_dirty(true);
-    };
-
-    /** 
-     * Toggle whether a cell's output is collapsed or expanded.
-     * 
-     * @param {integer} index - cell index
-     */
-    Notebook.prototype.toggle_output = function (index) {
-        var i = this.index_or_selected(index);
-        var cell = this.get_cell(i);
-        if (cell !== null && (cell instanceof codecell.CodeCell)) {
-            cell.toggle_output();
-            this.set_dirty(true);
-        }
-    };
-
-    /**
-     * Toggle whether all selected cells' outputs are collapsed or expanded.
-     *
-     * @param {integer} indices - the indices of the cells to toggle
-     */
-    Notebook.prototype.toggle_cells_outputs = function(indices) {
-        if (!indices) {
-            indices = this.get_selected_cells_indices();
-        }
-
-        for (var i = 0; i < indices.length; i++){
-            this.toggle_output(indices[i]);
-        }
-    };
-
-    /**
-     * Toggle the output of all cells.
-     */
-    Notebook.prototype.toggle_all_output = function () {
-        this.get_cells().map(function (cell) {
-            if (cell instanceof codecell.CodeCell) {
-                cell.toggle_output();
-            }
-        });
-        // this should not be set if the `collapse` key is removed from nbformat
-        this.set_dirty(true);
-    };
-
-    /**
-     * Toggle a scrollbar for long cell outputs.
-     * 
-     * @param {integer} index - cell index
-     */
-    Notebook.prototype.toggle_output_scroll = function (index) {
-        var i = this.index_or_selected(index);
-        var cell = this.get_cell(i);
-        if (cell !== null && (cell instanceof codecell.CodeCell)) {
-            cell.toggle_output_scroll();
-            this.set_dirty(true);
-        }
-    };
-
-    /**
-     * Toggle a scrollbar for selected long cells' outputs.
-     *
-     * @param {integer} indices - the indices of the cells to toggle
-     */
-    Notebook.prototype.toggle_cells_outputs_scroll = function(indices) {
-        if (!indices) {
-            indices = this.get_selected_cells_indices();
-        }
-
-        for (var i = 0; i < indices.length; i++){
-            this.toggle_output_scroll(indices[i]);
-        }
-    };
-
-    /**
-     * Toggle the scrolling of long output on all cells.
-     */
-    Notebook.prototype.toggle_all_output_scroll = function () {
-        this.get_cells().map(function (cell) {
-            if (cell instanceof codecell.CodeCell) {
-                cell.toggle_output_scroll();
-            }
-        });
-        // this should not be set if the `collapse` key is removed from nbformat
-        this.set_dirty(true);
-    };
-
-    // Other cell functions: line numbers, ...
-
-    /**
-     * Toggle line numbers in the selected cell's input area.
-     */
-    Notebook.prototype.cell_toggle_line_numbers = function() {
-        this.get_selected_cells().map(function(cell){cell.toggle_line_numbers();});
-    };
-
-
-    //dispatch codemirror mode to all cells.
-    Notebook.prototype._dispatch_mode = function(spec, newmode){
-        this.codemirror_mode = newmode;
-        codecell.CodeCell.options_default.cm_config.mode = newmode;
-        this.get_cells().map(function(cell) {
-            if (cell.cell_type === 'code'){
-                cell.code_mirror.setOption('mode', spec);
-                // This is currently redundant, because cm_config ends up as
-                // codemirror's own .options object, but I don't want to
-                // rely on that.
-                cell._options.cm_config.mode = spec;
-            }
-        });
-
-    };
-
-    // roughly try to check mode equality
-    var _mode_equal = function(mode1, mode2){
-        return ((mode1||{}).name||mode1)===((mode2||{}).name||mode2);
-    };
-    
-    /**
-     * Set the codemirror mode for all code cells, including the default for
-     * new code cells.
-     * Set the mode to 'null' (no highlighting) if it can't be found.
-     */
-    Notebook.prototype.set_codemirror_mode = function(newmode){
-        // if mode is the same don't reset,
-        // to avoid n-time re-highlighting.
-        if (_mode_equal(newmode, this.codemirror_mode)) {
-            return;
-        }
-        
-        var that = this;
-        utils.requireCodeMirrorMode(newmode, function (spec) {
-            that._dispatch_mode(spec, newmode);
-        }, function(){
-            // on error don't dispatch the new mode as re-setting it later will not work.
-            // don't either set to null mode if it has been changed in the meantime
-            if( _mode_equal(newmode, that.codemirror_mode) ){
-                that._dispatch_mode('null','null');
-            }
-        });
-    };
-
-    // Session related things
-
-    /**
-     * Start a new session and set it on each code cell.
-     */
-    Notebook.prototype.start_session = function (kernel_name) {
-        if (this._session_starting) {
-            throw new session.SessionAlreadyStarting();
-        }
-        this._session_starting = true;
-
-        var options = {
-            base_url: this.base_url,
-            ws_url: this.ws_url,
-            notebook_path: this.notebook_path,
-            notebook_name: this.notebook_name,
-            kernel_name: kernel_name,
-            notebook: this
-        };
-
-        var success = $.proxy(this._session_started, this);
-        var failure = $.proxy(this._session_start_failed, this);
-
-        if (this.session && this.session.kernel) {
-            this.session.restart(options, success, failure);
-        } else {
-            this.session = new session.Session(options);
-            this.session.start(success, failure);
-        }
-    };
-
-
-    /**
-     * Once a session is started, link the code cells to the kernel and pass the 
-     * comm manager to the widget manager.
-     */
-    Notebook.prototype._session_started = function (){
-        this._session_starting = false;
-        this.kernel = this.session.kernel;
-        var ncells = this.ncells();
-        for (var i=0; i<ncells; i++) {
-            var cell = this.get_cell(i);
-            if (cell instanceof codecell.CodeCell) {
-                cell.set_kernel(this.session.kernel);
-            }
-        }
-    };
-
-    /**
-     * Called when the session fails to start.
-     */
-    Notebook.prototype._session_start_failed = function(jqxhr, status, error){
-        this._session_starting = false;
-        utils.log_ajax_error(jqxhr, status, error);
-    };
-    
-    /**
-     * Prompt the user to restart the kernel and re-run everything.
-     * if options.confirm === false, no confirmation dialog is shown.
-     */
-    Notebook.prototype.restart_run_all = function (options) {
-        var that = this;
-        var restart_options = {};
-        restart_options.confirm = (options || {}).confirm;
-        restart_options.dialog = {
-            notebook: that,
-            keyboard_manager: that.keyboard_manager,
-            title : i18n.msg._("Restart kernel and re-run the whole notebook?"),
-            body : $("<p/>").text(
-                i18n.msg._('Are you sure you want to restart the current kernel and re-execute the whole notebook?  All variables and outputs will be lost.')
-            ),
-            buttons : {
-                "Restart and Run All Cells" : {
-                    "class" : "btn-danger",
-                    "click" : function () {
-                        that.execute_all_cells();
-                    },
-                },
-            }
-        };
-        return this._restart_kernel(restart_options);
-    };
-
-    /**
-     * Prompt the user to restart the kernel and clear output.
-     * if options.confirm === false, no confirmation dialog is shown.
-     */
-    Notebook.prototype.restart_clear_output = function (options) {
-        var that = this;
-        var restart_options = {};
-        restart_options.confirm = (options || {}).confirm;
-        restart_options.dialog = {
-            notebook: that,
-            keyboard_manager: that.keyboard_manager,
-            title : i18n.msg._("Restart kernel and clear all output?"),
-            body : $("<p/>").text(
-                i18n.msg._('Do you want to restart the current kernel and clear all output?  All variables and outputs will be lost.')
-            ),
-            buttons : {
-                "Restart and Clear All Outputs" : {
-                    "class" : "btn-danger",
-                    "click" : function (){
-                        that.clear_all_output();
-                    },
-                },
-            }
-        };
-        return this._restart_kernel(restart_options);
-    };
-
-    /**
-     * Prompt the user to restart the kernel.
-     * if options.confirm === false, no confirmation dialog is shown.
-     */
-    Notebook.prototype.shutdown_kernel = function (options) {
-        var that = this;
-        var shutdown_options = {};
-        shutdown_options.confirm = (options || {}).confirm;
-        shutdown_options.dialog = {
-            title : "Shutdown kernel?",
-            body : $("<p/>").text(
-                i18n.msg._('Do you want to shutdown the current kernel?  All variables will be lost.')
-            ),
-            buttons : {
-                "Shutdown" : {
-                    "class" : "btn-danger",
-                    "click" : function () {},
-                },
-            }
-        };
-        shutdown_options.kernel_action = function() {
-            that.session.delete();
-        };
-        return this._restart_kernel(shutdown_options);
-    };
-
-    Notebook.prototype.restart_kernel = function (options) {
-        var restart_options = {};
-        restart_options.confirm = (options || {}).confirm;
-        restart_options.dialog = {
-            title : i18n.msg._("Restart kernel?"),
-            body : $("<p/>").text(
-                i18n.msg._('Do you want to restart the current kernel?  All variables will be lost.')
-            ),
-            buttons : {
-                "Restart" : {
-                    "class" : "btn-danger",
-                    "click" : function () {},
-                },
-            }
-        };
-        return this._restart_kernel(restart_options);
-    };
-    
-    // inner implementation of restart dialog & promise
-    Notebook.prototype._restart_kernel = function (options) {
-        var that = this;
-        options = options || {};
-        var resolve_promise, reject_promise;
-        var promise = new Promise(function (resolve, reject){
-            resolve_promise = resolve;
-            reject_promise = reject;
-        });
-        
-        function restart_and_resolve () {
-            that.kernel.restart(function () {
-                // resolve when the kernel is *ready* not just started
-                that.events.one('kernel_ready.Kernel', resolve_promise);
-            }, reject_promise);
-        }
-
-        var do_kernel_action = options.kernel_action || restart_and_resolve;
-       
-        // no need to confirm if the kernel is not connected
-        if (options.confirm === false || !that.kernel.is_connected()) {
-            var default_button = options.dialog.buttons[Object.keys(options.dialog.buttons)[0]];
-            promise.then(default_button.click);
-            do_kernel_action();
-            return promise;
-        }
-        options.dialog.notebook = this;
-        options.dialog.keyboard_manager = this.keyboard_manager;
-        // add 'Continue running' cancel button
-        var buttons = {
-            "Continue Running": {},
-        };
-        // hook up button.click actions after restart promise resolves
-        Object.keys(options.dialog.buttons).map(function (key) {
-            var button = buttons[key] = options.dialog.buttons[key];
-            var click = button.click;
-            button.click = function () {
-                promise.then(click);
-                do_kernel_action();
-            };
-        });
-        options.dialog.buttons = buttons;
-        dialog.modal(options.dialog);
-        return promise;
-    };
-
-    /**
-     * 
-     * Halt the kernel and close the notebook window
-     */
-    Notebook.prototype.close_and_halt = function () {
-        var close_window = function () {
-            /**
-             * allow closing of new tabs in Chromium, impossible in FF
-             */
-                window.open('', '_self', '');
-                window.close();
-        };
-            // finish with close on success or failure
-            this.session.delete(close_window, close_window);
-    };
-    
-    /**
-     * Execute cells corresponding to the given indices.
-     *
-     * @param {Array} indices - indices of the cells to execute
-     */
-    Notebook.prototype.execute_cells = function (indices) {
-        if (indices.length === 0) {
-            return;
-        }
-
-        var cell;
-        for (var i = 0; i < indices.length; i++) {
-            cell = this.get_cell(indices[i]);
-            cell.execute();
-        }
-
-        this.select(indices[indices.length - 1]);
-        this.command_mode();
-        this.set_dirty(true);
-    };
-
-    /**
-     * Execute or render cell outputs and go into command mode.
-     */
-    Notebook.prototype.execute_selected_cells = function () {
-        this.execute_cells(this.get_selected_cells_indices());
-    };
-
-    
-    /**
-     * Alias for execute_selected_cells, for backwards compatibility --
-     * previously, doing "Run Cell" would only ever run a single cell (hence
-     * `execute_cell`), but now it runs all marked cells, so that's the
-     * preferable function to use. But it is good to keep this function to avoid
-     * breaking existing extensions, etc.
-     */
-    Notebook.prototype.execute_cell = function () {
-        this.execute_selected_cells();
-    };
-
-    /**
-     * Execute or render cell outputs and insert a new cell below.
-     */
-    Notebook.prototype.execute_cell_and_insert_below = function () {
-        var indices = this.get_selected_cells_indices();
-        var cell_index;
-        if (indices.length > 1) {
-            this.execute_cells(indices);
-            cell_index = Math.max.apply(Math, indices);
-        } else {
-            var cell = this.get_selected_cell();
-            cell_index = this.find_cell_index(cell);
-            cell.execute();
-        }
-
-        // If we are at the end always insert a new cell and return
-        if (cell_index === (this.ncells()-1)) {
-            this.command_mode();
-            this.insert_cell_below();
-            this.select(cell_index+1);
-            this.edit_mode();
-            this.scroll_to_bottom();
-            this.set_dirty(true);
-            return;
-        }
-
-        this.command_mode();
-        this.insert_cell_below();
-        this.select(cell_index+1);
-        this.edit_mode();
-        this.set_dirty(true);
-    };
-
-    /**
-     * Execute or render cell outputs and select the next cell.
-     */
-    Notebook.prototype.execute_cell_and_select_below = function () {
-        var indices = this.get_selected_cells_indices();
-        var cell_index;
-        if (indices.length > 1) {
-            this.execute_cells(indices);
-            cell_index = Math.max.apply(Math, indices);
-        } else {
-            var cell = this.get_selected_cell();
-            cell_index = this.find_cell_index(cell);
-            cell.execute();
-        }
-
-        // If we are at the end always insert a new cell and return
-        if (cell_index === (this.ncells()-1)) {
-            this.command_mode();
-            this.insert_cell_below();
-            this.select(cell_index+1);
-            this.edit_mode();
-            this.scroll_to_bottom();
-            this.set_dirty(true);
-            return;
-        }
-
-        this.command_mode();
-        this.select(cell_index+1);
-        this.focus_cell();
-        this.set_dirty(true);
-    };
-
-    /**
-     * Execute all cells below the selected cell.
-     */
-    Notebook.prototype.execute_cells_below = function () {
-        this.execute_cell_range(this.get_selected_index(), this.ncells());
-        this.scroll_to_bottom();
-    };
-
-    /**
-     * Execute all cells above the selected cell.
-     */
-    Notebook.prototype.execute_cells_above = function () {
-        this.execute_cell_range(0, this.get_selected_index());
-    };
-
-    /**
-     * Execute all cells.
-     */
-    Notebook.prototype.execute_all_cells = function () {
-        this.execute_cell_range(0, this.ncells());
-        this.scroll_to_bottom();
-    };
-
-    /**
-     * Execute a contiguous range of cells.
-     * 
-     * @param {integer} start - index of the first cell to execute (inclusive)
-     * @param {integer} end - index of the last cell to execute (exclusive)
-     */
-    Notebook.prototype.execute_cell_range = function (start, end) {
-        this.command_mode();
-        var indices = [];
-        for (var i=start; i<end; i++) {
-            indices.push(i);
-        }
-        this.execute_cells(indices);
-    };
-
-    // Persistance and loading
-
-    /**
-     * Getter method for this notebook's name.
-     * 
-     * @return {string} This notebook's name (excluding file extension)
-     */
-    Notebook.prototype.get_notebook_name = function () {
-        return utils.splitext(this.notebook_name)[0];
-    };
-
-    /**
-     * Setter method for this notebook's name.
-     *
-     * @param {string} name
-     */
-    Notebook.prototype.set_notebook_name = function (name) {
-        var parent = utils.url_path_split(this.notebook_path)[0];
-        this.notebook_name = name;
-        this.notebook_path = utils.url_path_join(parent, name);
-    };
-
-    /**
-     * Check that a notebook's name is valid.
-     * 
-     * @param {string} nbname - A name for this notebook
-     * @return {boolean} True if the name is valid, false if invalid
-     */
-    Notebook.prototype.test_notebook_name = function (nbname) {
-        nbname = nbname || '';
-        return nbname.length > 0 && !this.notebook_name_blacklist_re.test(nbname);
-    };
-
-    /**
-     Move the unused attachments garbage collection logic to TextCell.toJSON.
-     * Load a notebook from JSON (.ipynb).
-     *
-     * @param {object} data - JSON representation of a notebook
-     */
-    Notebook.prototype.fromJSON = function (data) {
-
-        var content = data.content;
-        var ncells = this.ncells();
-        var i;
-        for (i=0; i<ncells; i++) {
-            // Always delete cell 0 as they get renumbered as they are deleted.
-            this._unsafe_delete_cell(0);
-        }
-        // Save the metadata and name.
-        this.metadata = content.metadata;
-        this.notebook_name = data.name;
-        this.notebook_path = data.path;
-        var trusted = true;
-        
-        // Set the codemirror mode from language_info metadata
-        if (this.metadata.language_info !== undefined) {
-            var langinfo = this.metadata.language_info;
-            // Mode 'null' should be plain, unhighlighted text.
-            var cm_mode = langinfo.codemirror_mode || langinfo.name || 'null';
-            this.set_codemirror_mode(cm_mode);
-        }
-        
-        var new_cells = content.cells;
-        ncells = new_cells.length;
-        var cell_data = null;
-        var new_cell = null;
-        for (i=0; i<ncells; i++) {
-            cell_data = new_cells[i];
-            new_cell = this.insert_cell_at_index(cell_data.cell_type, i);
-            new_cell.fromJSON(cell_data);
-            if (new_cell.cell_type === 'code' && !new_cell.output_area.trusted) {
-                trusted = false;
-            }
-        }
-        if (trusted !== this.trusted) {
-            this.trusted = trusted;
-            this.events.trigger("trust_changed.Notebook", trusted);
-        }
-
-        this.apply_directionality();
-
-    };
-
-    /**
-     * Dump this notebook into a JSON-friendly object.
-     * 
-     * @return {object} A JSON-friendly representation of this notebook.
-     */
-    Notebook.prototype.toJSON = function () {
-        // remove the conversion indicator, which only belongs in-memory
-        delete this.metadata.orig_nbformat;
-        delete this.metadata.orig_nbformat_minor;
-
-        var cells = this.get_cells();
-        var ncells = cells.length;
-        var cell_array = new Array(ncells);
-        var trusted = true;
-        for (var i=0; i<ncells; i++) {
-            var cell = cells[i];
-            if (cell.cell_type === 'code' && !cell.output_area.trusted) {
-                trusted = false;
-            }
-            cell_array[i] = cell.toJSON(true);
-        }
-        var data = {
-            cells: cell_array,
-            metadata: this.metadata,
-            nbformat: this.nbformat,
-            nbformat_minor: this.nbformat_minor
-        };
-        if (trusted !== this.trusted) {
-            this.trusted = trusted;
-            this.events.trigger("trust_changed.Notebook", trusted);
-        }
-        return data;
-    };
-
-    /**
-     * Start an autosave timer which periodically saves the notebook.
-     * 
-     * @param {integer} interval - the autosave interval in milliseconds
-     */
-    Notebook.prototype.set_autosave_interval = function (interval) {
-        var that = this;
-        // clear previous interval, so we don't get simultaneous timers
-        if (this.autosave_timer) {
-            clearInterval(this.autosave_timer);
-        }
-        if (!this.writable) {
-            // disable autosave if not writable
-            interval = 0;
-        }
-        
-        this.autosave_interval = this.minimum_autosave_interval = interval;
-        if (interval) {
-            this.autosave_timer = setInterval(function() {
-                if (that.dirty) {
-                    that.save_notebook();
-                }
-            }, interval);
-            this.events.trigger("autosave_enabled.Notebook", interval);
-        } else {
-            this.autosave_timer = null;
-            this.events.trigger("autosave_disabled.Notebook");
-        }
-    };
-    
-    /**
-     * Save this notebook on the server. This becomes a notebook instance's
-     * .save_notebook method *after* the entire notebook has been loaded.
-     *
-     */
-    Notebook.prototype.save_notebook = function (check_last_modified) {
-        if (check_last_modified === undefined) {
-            check_last_modified = true;
-        }
-
-        var error;
-        if (!this._fully_loaded) {
-            error = new Error("Load failed, save is disabled");
-            this.events.trigger('notebook_save_failed.Notebook', error);
-            return Promise.reject(error);
-        } else if (!this.writable) {
-            error = new Error("Notebook is read-only");
-            this.events.trigger('notebook_save_failed.Notebook', error);
-            return Promise.reject(error);
-        }
-
-        // Trigger an event before save, which allows listeners to modify
-        // the notebook as needed.
-        this.events.trigger('before_save.Notebook');
-
-        // Create a JSON model to be sent to the server.
-        var model = {
-            type : "notebook",
-            content : this.toJSON()
-        };
-        // time the ajax call for autosave tuning purposes.
-        var start =  new Date().getTime();
-
-        var that = this;
-        var _save = function () {
-            return that.contents.save(that.notebook_path, model).then(
-                $.proxy(that.save_notebook_success, that, start),
-                function (error) {
-                    that.events.trigger('notebook_save_failed.Notebook', error);
-                    // This hasn't handled the error, so propagate it up
-                    return Promise.reject(error);
-                }
-            );
-        };
-
-        if (check_last_modified) {
-            return this.contents.get(this.notebook_path, {content: false}).then(
-                function (data) {
-                    var last_modified = new Date(data.last_modified);
-                    var last_modified_check_margin = (that.config.data['last_modified_check_margin'] || 0.5) * 1000; // 500 ms
-                    // We want to check last_modified (disk) > that.last_modified (our last save)
-                    // In some cases the filesystem reports an inconsistent time,
-                    // so we allow 0.5 seconds difference before complaining.
-                    // This is configurable in nbconfig/notebook.json as `last_modified_check_margin`.
-                    if ((last_modified.getTime() - that.last_modified.getTime()) > last_modified_check_margin) {  
-                        console.warn("Last saving was done on `"+that.last_modified+"`("+that._last_modified+"), "+
-                                    "while the current file seem to have been saved on `"+data.last_modified+"`");
-                        if (that._changed_on_disk_dialog !== null) {
-                            // update save callback on the confirmation button
-                            that._changed_on_disk_dialog.find('.save-confirm-btn').click(_save);
-                            //Rebind Click Event on Reload
-                            that._changed_on_disk_dialog.find('.btn-warning').click(function () {window.location.reload()});
-                            // redisplay existing dialog
-                            that._changed_on_disk_dialog.modal('show');
-                        } else {
-                          // create new dialog
-                          that._changed_on_disk_dialog = dialog.modal({
-                            notebook: that,
-                            keyboard_manager: that.keyboard_manager,
-                            title: i18n.msg._("Notebook changed"),
-                            body: i18n.msg._("The notebook file has changed on disk since the last time we opened or saved it. "
-                                  + "Do you want to overwrite the file on disk with the version open here, or load "
-                                  + "the version on disk (reload the page)?"),
-                            buttons: {
-                                Reload: {
-                                    class: 'btn-warning',
-                                    click: function() {
-                                        window.location.reload();
-                                    }
-                                },
-                                Cancel: {},
-                                Overwrite: {
-                                    class: 'btn-danger save-confirm-btn',
-                                    click: function () {
-                                        _save();
-                                    }
-                                },
-                            }
-                          });
-                        }
-                    } else {
-                        return _save();
-                    }
-                }, function () {
-                    // maybe it has been deleted or renamed? Go ahead and save.
-                    return _save();
-                }
-            );
-        } else {
-            return _save();
-        }
-    };
-    
-    /**
-     * Success callback for saving a notebook.
-     * 
-     * @param {integer} start - Time when the save request start
-     * @param {object}  data - JSON representation of a notebook
-     */
-    Notebook.prototype.save_notebook_success = function (start, data) {
-        this.set_dirty(false);
-        this.last_modified = new Date(data.last_modified);
-        // debug 484
-        this._last_modified = 'save-success:'+data.last_modified;
-        if (data.message) {
-            // save succeeded, but validation failed.
-            var body = $("<div>");
-            var title = i18n.msg._("Notebook validation failed");
-
-            body.append($("<p>").text(
-                i18n.msg._("The save operation succeeded," +
-                " but the notebook does not appear to be valid." +
-                " The validation error was:")
-            )).append($("<div>").addClass("validation-error").append(
-                $("<pre>").text(data.message)
-            ));
-            dialog.modal({
-                notebook: this,
-                keyboard_manager: this.keyboard_manager,
-                title: title,
-                body: body,
-                buttons : {
-                    OK : {
-                        "class" : "btn-primary"
-                    }
-                }
-            });
-        }
-        this.events.trigger('notebook_saved.Notebook');
-        this._update_autosave_interval(start);
-        if (this._checkpoint_after_save) {
-            this.create_checkpoint();
-            this._checkpoint_after_save = false;
-        }
-        return data;
-    };
-
-    Notebook.prototype.save_notebook_as = function() {
-        var that = this;
-        var current_dir = $('body').attr('data-notebook-path').split('/').slice(0, -1).join("/");
-        current_dir = current_dir? current_dir + "/": "";
-        current_dir = decodeURIComponent(current_dir);
-        var dialog_body = $('<div/>').append(
-            $('<p/>').addClass('save-message')
-                .text(i18n.msg._('Enter a notebook path relative to notebook dir'))
-        ).append(
-            $('<br/>')
-        ).append(
-            $('<input/>').attr('type','text').attr('size','25')
-            .attr('data-testid', 'save-as')
-            .addClass('form-control')
-        );
-
-        var d = dialog.modal({
-            title: 'Save As',
-            body: dialog_body,
-            keyboard_manager: this.keyboard_manager,
-            notebook: this,
-            buttons: {
-                Cancel: {},
-                Save: {
-                    class: 'btn-primary',
-                    click: function() {
-                        var nb_path = d.find('input').val();
-                        var nb_name = nb_path.split('/').slice(-1).pop();
-                        if (!nb_name) {
-                            $(".save-message").html(
-                                    $("<span>")
-                                        .attr("style", "color:red;")
-                                        .text($(".save-message").text())
-                                );
-                            return false;
-                        }
-                        // If notebook name does not contain extension '.ipynb' add it
-                        var ext = utils.splitext(nb_name)[1];
-                        if (ext === '') {
-                            nb_name = nb_name + '.ipynb';
-                            nb_path = nb_path + '.ipynb';
-                        }
-                        var save_thunk = function() {
-                            var model = {
-                                'type': 'notebook',
-                                'content': that.toJSON(),
-                                'name': nb_name
-                            };
-                            var start = new Date().getTime();
-                            return that.contents.save(nb_path, model)
-                                .then(function(data) {
-                                    d.modal('hide');
-                                    that.writable = true;
-                                    that.notebook_name = data.name;
-                                    that.notebook_path = data.path;
-                                    that.session.rename_notebook(data.path);
-                                    that.events.trigger('notebook_renamed.Notebook', data);
-                                    that.save_notebook_success(start, data);
-                                }, function(error) {
-                                    var msg = i18n.msg._(error.message || 'Unknown error saving notebook');
-                                    $(".save-message").html(
-                                        $("<span>")
-                                            .attr("style", "color:red;")
-                                            .text(msg)
-                                    );
-                                });
-                        };
-                        that.contents.get(nb_path, {type: 'notebook', content: false}).then(function(data) {
-                            var warning_body = $('<div/>').append(
-                                $("<p/>").text(i18n.msg._('Notebook with that name exists.')));
-                            dialog.modal({
-                                title: 'Save As',
-                                body: warning_body,
-                                buttons: {Cancel: {},
-                                Overwrite: {
-                                    class: 'btn-warning',
-                                    click: function() {
-                                        return save_thunk();
-                                    }
-                                }
-                            }
-                            });
-                        }, function(err) {
-                            return save_thunk();
-                        });
-                        return false;
-                    }
-                },
-            },
-            open : function () {
-                d.find('input[type="text"]').keydown(function (event) {
-                    if (event.which === keyboard.keycodes.enter) {
-                        d.find('.btn-primary').first().click();
-                        return false;
-                    }
-                });
-                d.find('input[type="text"]').val(current_dir).focus();
-             }
-         });
-    };
-
-    /**
-     * Update the autosave interval based on the duration of the last save.
-     * 
-     * @param {integer} start - when the save request started
-     */
-    Notebook.prototype._update_autosave_interval = function (start) {
-        var duration = (new Date().getTime() - start);
-        if (this.autosave_interval) {
-            // new save interval: higher of 10x save duration or parameter (default 30 seconds)
-            var interval = Math.max(10 * duration, this.minimum_autosave_interval);
-            // ceil to 10 seconds, otherwise we will be setting a new interval too often
-            // do not round or anything below 5000ms will desactivate saving.
-            interval = 10000 * Math.ceil(interval / 10000);
-            // set new interval, if it's changed
-            if (interval !== this.autosave_interval) {
-                this.set_autosave_interval(interval);
-            }
-        }
-    };
-
-    /**
-     * Explicitly trust the output of this notebook.
-     */
-    Notebook.prototype.trust_notebook = function (from_notification) {
-        var body = $("<div>").append($("<p>")
-            .text(i18n.msg._("A trusted Jupyter notebook may execute hidden malicious code when you open it. " +
-                    "Selecting trust will immediately reload this notebook in a trusted state. " +
-                    "For more information, see the Jupyter security documentation: "))
-            .append($("<a>").attr("href", "https://jupyter-notebook.readthedocs.io/en/stable/security.html")
-                .text(i18n.msg._("here"))
-            )
-        );
-
-        var nb = this;
-        dialog.modal({
-            notebook: this,
-            keyboard_manager: this.keyboard_manager,
-            title: i18n.msg._("Trust this notebook?"),
-            body: body,
-            focus_button: from_notification,
-
-            buttons: {
-                Cancel : {},
-                Trust : {
-                    class : "btn-danger",
-                    click : function () {
-                        var cells = nb.get_cells();
-                        for (var i = 0; i < cells.length; i++) {
-                            var cell = cells[i];
-                            if (cell.cell_type === 'code') {
-                                cell.output_area.trusted = true;
-                            }
-                        }
-                        // If its write only and dirty, save before 
-                        // trusting
-                        var pr;
-                        if(nb.writable && nb.dirty) {
-                            pr = nb.save_notebook();
-                        }
-                        else {
-                            pr = Promise.resolve();
-                        }
-                        return pr.then(function() {                            
-                            nb.contents.trust(nb.notebook_path)
-                            .then(function() {
-                                nb.events.trigger("trust_changed.Notebook", true);
-                                window.location.reload();
-                            }, function(err) {
-                                console.log(err);
-                            });
-                        });
-                    }
-                }
-            }
-        });
-    };
-
-    /**
-     * Make a copy of the current notebook.
-     * If the notebook has unsaved changes, it is saved first.
-     */
-    Notebook.prototype.copy_notebook = function () {
-        var that = this;
-        var base_url = this.base_url;
-        var w = window.open('', IPython._target);
-        var parent = utils.url_path_split(this.notebook_path)[0];
-        var p;
-        if (this.dirty && this.writable) {
-            p = this.save_notebook(true);
-        } else {
-            p = Promise.resolve();
-        }
-        return p.then(function () {
-            return that.contents.copy(that.notebook_path, parent).then(
-                function (data) {
-                    w.location = utils.url_path_join(
-                        base_url, 'notebooks', utils.encode_uri_components(data.path)
-                    );
-                },
-                function(error) {
-                    w.close();
-                    that.events.trigger('notebook_copy_failed', error);
-                }
-            );
-        });
-    };
-    
-    /**
-     * Ensure a filename has the right extension
-     * Returns the filename with the appropriate extension, appending if necessary.
-     */
-    Notebook.prototype.ensure_extension = function (name) {
-        var ext = utils.splitext(this.notebook_path)[1];
-        if (ext.length && name.slice(-ext.length) !== ext) {
-            name = name + ext;
-        }
-        return name;
-    };
-
-    /**
-     * Rename the notebook.
-     * @param  {string} new_name
-     * @return {Promise} promise that resolves when the notebook is renamed.
-     */
-    Notebook.prototype.rename = function (new_name) {
-        new_name = this.ensure_extension(new_name);
-
-        var that = this;
-        var parent = utils.url_path_split(this.notebook_path)[0];
-        var new_path = utils.url_path_join(parent, new_name);
-        return this.contents.rename(this.notebook_path, new_path).then(
-            function (json) {
-                that.notebook_name = json.name;
-                that.notebook_path = json.path;
-                that.last_modified = new Date(json.last_modified);
-                // debug 484
-                that._last_modified = json.last_modified;
-                that.session.rename_notebook(json.path);
-                that.events.trigger('notebook_renamed.Notebook', json);
-            }
-        );
-    };
-
-    /**
-     * Delete this notebook
-     */
-    Notebook.prototype.delete = function () {
-        this.contents.delete(this.notebook_path);
-    };
-
-    /**
-     * Request a notebook's data from the server.
-     * 
-     * @param {string} notebook_path - A notebook to load
-     */
-    Notebook.prototype.load_notebook = function (notebook_path) {
-        this.notebook_path = notebook_path;
-        this.notebook_name = utils.url_path_split(this.notebook_path)[1];
-        this.events.trigger('notebook_loading.Notebook');
-        this.contents.get(notebook_path, {type: 'notebook'}).then(
-            $.proxy(this.load_notebook_success, this),
-            $.proxy(this.load_notebook_error, this)
-        );
-    };
-
-    /**
-     * Success callback for loading a notebook from the server.
-     * 
-     * Load notebook data from the JSON response.
-     * 
-     * @param {object} data JSON representation of a notebook
-     */
-    Notebook.prototype.load_notebook_success = function (data) {
-        var failed, msg;
-        try {
-            this.fromJSON(data);
-        } catch (e) {
-            failed = e;
-            console.error("Notebook failed to load from JSON:", e);
-        }
-        if (failed || data.message) {
-            // *either* fromJSON failed or validation failed
-            var body = $("<div>");
-            var title;
-            if (failed) {
-                title = i18n.msg._("Notebook failed to load");
-                body.append($("<p>").text(
-                    i18n.msg._("The error was: ")
-                )).append($("<div>").addClass("js-error").text(
-                    failed.toString()
-                )).append($("<p>").text(
-                    i18n.msg._("See the error console for details.")
-                ));
-            } else {
-                title = i18n.msg._("Notebook validation failed");
-            }
-
-            if (data.message) {
-                if (failed) {
-                    msg = i18n.msg._("The notebook also failed validation:");
-                } else {
-                    msg = i18n.msg._("An invalid notebook may not function properly." +
-                    " The validation error was:");
-                }
-                body.append($("<p>").text(
-                    msg
-                )).append($("<div>").addClass("validation-error").append(
-                    $("<pre>").text(data.message)
-                ));
-            }
-
-            dialog.modal({
-                notebook: this,
-                keyboard_manager: this.keyboard_manager,
-                title: title,
-                body: body,
-                buttons : {
-                    OK : {
-                        "class" : "btn-primary"
-                    }
-                }
-            });
-        }
-        if (this.ncells() === 0) {
-            this.insert_cell_below('code');
-            this.edit_mode(0);
-        } else {
-            this.select(0);
-            this.handle_command_mode(this.get_cell(0));
-        }
-        this.set_dirty(false);
-        this.scroll_to_top();
-        this.writable = data.writable || false;
-        this.last_modified = new Date(data.last_modified);
-        // debug 484
-        this._last_modified = 'load-success:'+data.last_modified;
-        var nbmodel = data.content;
-        var orig_nbformat = nbmodel.metadata.orig_nbformat;
-        var orig_nbformat_minor = nbmodel.metadata.orig_nbformat_minor;
-        if (orig_nbformat !== undefined && nbmodel.nbformat !== orig_nbformat) {
-            var oldmsg = i18n.msg._("This notebook has been converted from an older notebook format" +
-            " to the current notebook format v(%s).");
-            var newmsg = i18n.msg._("This notebook has been converted from a newer notebook format" +
-            " to the current notebook format v(%s).");
-            if (nbmodel.nbformat > orig_nbformat) {
-                msg = i18n.msg.sprintf(oldmsg,nbmodel.nbformat);
-            } else {
-                msg = i18n.msg.sprintf(newmsg,nbmodel.nbformat);
-            }
-            msg += " ";
-            msg += i18n.msg._("The next time you save this notebook, the " +
-            "current notebook format will be used.");
-            
-            msg += " ";
-            if (nbmodel.nbformat > orig_nbformat) {
-                msg += i18n.msg._("Older versions of Jupyter may not be able to read the new format.");
-            } else {
-                msg += i18n.msg._("Some features of the original notebook may not be available.");
-            }
-            msg += " ";
-            msg += i18n.msg._("To preserve the original version, close the " +
-                "notebook without saving it.");
-            dialog.modal({
-                notebook: this,
-                keyboard_manager: this.keyboard_manager,
-                title : i18n.msg._("Notebook converted"),
-                body : msg,
-                buttons : {
-                    OK : {
-                        class : "btn-primary"
-                    }
-                }
-            });
-        } else if (this.nbformat_minor < nbmodel.nbformat_minor) {
-            this.nbformat_minor = nbmodel.nbformat_minor;
-        }
-
-        if (this.session === null) {
-            var kernel_name = utils.get_url_param('kernel_name');
-            if (kernel_name) {
-                this.kernel_selector.set_kernel(kernel_name);
-            } else if (this.metadata.kernelspec) {
-                this.kernel_selector.set_kernel(this.metadata.kernelspec);
-            } else if (this.metadata.language) {
-                // compat with IJulia, IHaskell, and other early kernels
-                // adopters that where setting a language metadata.
-                this.kernel_selector.set_kernel({
-                    name: i18n.msg._("(No name)"),
-                    language: this.metadata.language
-                  });
-                // this should be stored in kspec now, delete it.
-                // remove once we do not support notebook v3 anymore.
-                delete this.metadata.language;
-            } else {
-                // setting kernel via set_kernel above triggers start_session,
-                // otherwise start a new session with the server's default kernel
-                // spec_changed events will fire after kernel is loaded
-                this.start_session();
-            }
-        }
-        // load our checkpoint list
-        this.list_checkpoints();
-        
-        // load toolbar state
-        if (this.metadata.celltoolbar) {
-            celltoolbar.CellToolbar.global_show();
-            celltoolbar.CellToolbar.activate_preset(this.metadata.celltoolbar);
-        } else {
-            celltoolbar.CellToolbar.global_hide();
-        }
-        
-        if (!this.writable) {
-            this.set_autosave_interval(0);
-            this.events.trigger('notebook_read_only.Notebook');
-        }
-        
-        // now that we're fully loaded, it is safe to restore save functionality
-        this._fully_loaded = true;
-        this.events.trigger('notebook_loaded.Notebook');
-    };
-
-    Notebook.prototype.set_kernelselector = function(k_selector){
-        this.kernel_selector = k_selector;
-    };
-
-    /**
-     * Failure callback for loading a notebook from the server.
-     * 
-     * @param {Error} error
-     */
-    Notebook.prototype.load_notebook_error = function (error) {
-        var isSanitized = true;
-        this.events.trigger('notebook_load_failed.Notebook', error);
-        var msg;
-        if (error.name === utils.XHR_ERROR && error.xhr.status === 500) {
-            utils.log_ajax_error(error.xhr, error.xhr_status, error.xhr_error);
-            msg = i18n.msg.sprintf(i18n.msg._("An unknown error occurred while loading this notebook. " +
-            "This version can load notebook formats %s or earlier. See the server log for details.",
-            "v" + this.nbformat));
-        } else {
-            msg = error.message;
-            console.warn('Error stack trace while loading notebook was:');
-            console.warn(error.stack);
-        }
-        if (navigator.cookieEnabled == false){
-            msg = i18n.msg._("Jupyter requires cookies to work; please enable cookies" +
-                " and refresh page. <a href=\"https://www.wikihow.com/Enable-Cookies-in-Your-Internet-Web-Browser\"> Learn more about enabling cookies. </a>");
-            isSanitized = false;
-        }
-        dialog.modal({
-            notebook: this,
-            keyboard_manager: this.keyboard_manager,
-            title: i18n.msg._("Error loading notebook"),
-            body : msg,
-            buttons : {
-                "Close": {
-                    class : 'btn-danger',
-                    click : function () {
-                        window.close();
-                    }
-                }
-              },
-              sanitize: isSanitized
-          
-        });
-    };
-
-    /*********************  checkpoint-related  ********************/
-    
-    /**
-     * Save the notebook then immediately create a checkpoint.
-     */
-    Notebook.prototype.save_checkpoint = function () {
-        this._checkpoint_after_save = true;
-        return this.save_notebook(true);
-    };
-    
-    /**
-     * Add a checkpoint for this notebook.
-     */
-    Notebook.prototype.add_checkpoint = function (checkpoint) {
-        var found = false;
-        for (var i = 0; i < this.checkpoints.length; i++) {
-            var existing = this.checkpoints[i];
-            if (existing.id === checkpoint.id) {
-                found = true;
-                this.checkpoints[i] = checkpoint;
-                break;
-            }
-        }
-        if (!found) {
-            this.checkpoints.push(checkpoint);
-        }
-        this.last_checkpoint = this.checkpoints[this.checkpoints.length - 1];
-    };
-    
-    /**
-     * List checkpoints for this notebook.
-     */
-    Notebook.prototype.list_checkpoints = function () {
-        var that = this;
-        this.contents.list_checkpoints(this.notebook_path).then(
-            $.proxy(this.list_checkpoints_success, this),
-            function(error) {
-                that.events.trigger('list_checkpoints_failed.Notebook', error);
-            }
-        );
-    };
-
-    /**
-     * Success callback for listing checkpoints.
-     * 
-     * @param {object} data - JSON representation of a checkpoint
-     */
-    Notebook.prototype.list_checkpoints_success = function (data) {
-        this.checkpoints = data;
-        if (data.length) {
-            this.last_checkpoint = data[data.length - 1];
-        } else {
-            this.last_checkpoint = null;
-        }
-        this.events.trigger('checkpoints_listed.Notebook', [data]);
-    };
-
-    /**
-     * Create a checkpoint of this notebook on the server from the most recent save.
-     */
-    Notebook.prototype.create_checkpoint = function () {
-        var that = this;
-        this.contents.create_checkpoint(this.notebook_path).then(
-            $.proxy(this.create_checkpoint_success, this),
-            function (error) {
-                that.events.trigger('checkpoint_failed.Notebook', error);
-            }
-        );
-    };
-
-    /**
-     * Success callback for creating a checkpoint.
-     * 
-     * @param {object} data - JSON representation of a checkpoint
-     */
-    Notebook.prototype.create_checkpoint_success = function (data) {
-        this.add_checkpoint(data);
-        this.events.trigger('checkpoint_created.Notebook', data);
-    };
-
-    /**
-     * Display the restore checkpoint dialog
-     * @param  {string} checkpoint ID
-     */
-    Notebook.prototype.restore_checkpoint_dialog = function (checkpoint) {
-        var that = this;
-        checkpoint = checkpoint || this.last_checkpoint;
-        if ( ! checkpoint ) {
-            console.log("restore dialog, but no checkpoint to restore to!");
-            return;
-        }
-        var body = $('<div/>').append(
-            $('<p/>').addClass("p-space").text(
-                i18n.msg._("Are you sure you want to revert the notebook to " +
-                "the latest checkpoint?")
-            ).append(
-                $("<strong/>").text(" "+i18n.msg._("This cannot be undone."))
-            )
-        ).append(
-            $('<p/>').addClass("p-space").text(i18n.msg._("The checkpoint was last updated at:"))
-        ).append(
-            $('<p/>').addClass("p-space").text(
-                moment(checkpoint.last_modified).format('LLLL') +
-                ' ('+moment(checkpoint.last_modified).fromNow()+')'// Long form:  Tuesday, January 27, 2015 12:15 PM
-            ).css("text-align", "center")
-        );
-        
-        dialog.modal({
-            notebook: this,
-            keyboard_manager: this.keyboard_manager,
-            title : i18n.msg._("Revert notebook to checkpoint"),
-            body : body,
-            default_button: "Cancel",
-            buttons : {
-                Cancel: {},
-                Revert : {
-                    class : "btn-danger",
-                    click : function () {
-                        that.restore_checkpoint(checkpoint.id);
-                    }
-                }
-            }
-        });
-    };
-    
-    /**
-     * Restore the notebook to a checkpoint state.
-     * 
-     * @param {string} checkpoint ID
-     */
-    Notebook.prototype.restore_checkpoint = function (checkpoint) {
-        this.events.trigger('notebook_restoring.Notebook', checkpoint);
-        var that = this;
-        this.contents.restore_checkpoint(this.notebook_path, checkpoint).then(
-            $.proxy(this.restore_checkpoint_success, this),
-            function (error) {
-                that.events.trigger('checkpoint_restore_failed.Notebook', error);
-            }
-        );
-    };
-    
-    /**
-     * Success callback for restoring a notebook to a checkpoint.
-     */
-    Notebook.prototype.restore_checkpoint_success = function () {
-        this.events.trigger('checkpoint_restored.Notebook');
-        this.load_notebook(this.notebook_path);
-    };
-
-    /**
-     * Delete a notebook checkpoint.
-     * 
-     * @param {string} checkpoint ID
-     */
-    Notebook.prototype.delete_checkpoint = function (checkpoint) {
-        this.events.trigger('notebook_restoring.Notebook', checkpoint);
-        var that = this;
-        this.contents.delete_checkpoint(this.notebook_path, checkpoint).then(
-            $.proxy(this.delete_checkpoint_success, this),
-            function (error) {
-                that.events.trigger('checkpoint_delete_failed.Notebook', error);
-            }
-        );
-    };
-    
-    /**
-     * Success callback for deleting a notebook checkpoint.
-     */
-    Notebook.prototype.delete_checkpoint_success = function () {
-        this.events.trigger('checkpoint_deleted.Notebook');
-        this.load_notebook(this.notebook_path);
-    };
-
-    return {Notebook: Notebook};
-});
diff --git a/notebook/static/notebook/js/notificationarea.js b/notebook/static/notebook/js/notificationarea.js
deleted file mode 100644
index b6615cd9a..000000000
--- a/notebook/static/notebook/js/notificationarea.js
+++ /dev/null
@@ -1,414 +0,0 @@
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/dialog',
-    'base/js/notificationarea',
-    'moment'
-], function($, utils, i18n, dialog, notificationarea, moment) {
-    "use strict";
-
-    var NotificationArea = notificationarea.NotificationArea;
-    
-    var NotebookNotificationArea = function(selector, options) {
-        NotificationArea.apply(this, [selector, options]);
-        this.save_widget = options.save_widget;
-        this.notebook = options.notebook;
-        this.keyboard_manager = options.keyboard_manager;
-    };
-    
-    NotebookNotificationArea.prototype = Object.create(NotificationArea.prototype);
-    
-    /**
-     * Initialize the default set of notification widgets.
-     *
-     * @method init_notification_widgets
-     */
-    NotebookNotificationArea.prototype.init_notification_widgets = function () {
-        this.init_kernel_notification_widget();
-        this.init_notebook_notification_widget();
-        this.init_trusted_notebook_notification_widget();
-    };
-
-    /**
-     * Initialize the notification widget for kernel status messages.
-     *
-     * @method init_kernel_notification_widget
-     */
-    NotebookNotificationArea.prototype.init_kernel_notification_widget = function () {
-        var that = this;
-        var knw = this.widget('kernel');
-        var $kernel_ind_icon = $("#kernel_indicator_icon");
-        var $modal_ind_icon = $("#modal_indicator");
-        var $readonly_ind_icon = $('#readonly-indicator');
-        var $body = $('body');
-        var busy_favicon_timer = -1;
-        
-        var set_busy_favicon = function(on) {
-            if (on) {
-                // Only show the busy icon if execution lasts > 1s
-                // This is to avoid rapidly switching icons and making lots of
-                // HTTP requests.
-                clearTimeout(busy_favicon_timer);
-                busy_favicon_timer = setTimeout(function() {
-                    utils.change_favicon('/static/base/images/favicon-busy-1.ico');
-                }, 1000);
-            } else {
-                clearTimeout(busy_favicon_timer);
-                utils.change_favicon('/static/base/images/favicon-notebook.ico');
-            }
-        };
-
-        // Listen for the notebook loaded event.  Set readonly indicator.
-        this.events.on('notebook_loaded.Notebook', function() {
-            if (that.notebook.writable) {
-                $readonly_ind_icon.hide();
-            } else {
-                $readonly_ind_icon.show();
-            }
-        });
-
-        // Command/Edit mode
-        this.events.on('edit_mode.Notebook', function () {
-            that.save_widget.update_document_title();
-            $body.addClass('edit_mode');
-            $body.removeClass('command_mode');
-            $modal_ind_icon.attr('title',i18n.msg._('Edit Mode'));
-        });
-
-        this.events.on('command_mode.Notebook', function () {
-            that.save_widget.update_document_title();
-            $body.removeClass('edit_mode');
-            $body.addClass('command_mode');
-            $modal_ind_icon.attr('title',i18n.msg._('Command Mode'));
-        });
-
-        // Implicitly start off in Command mode, switching to Edit mode will trigger event
-        $modal_ind_icon.addClass('modal_indicator').attr('title',i18n.msg._('Command Mode'));
-        $body.addClass('command_mode');
-
-        // Kernel events
-
-        // this can be either kernel_created.Kernel or kernel_created.Session
-        this.events.on('kernel_created.Kernel kernel_created.Session', function () {
-            knw.info(i18n.msg._("Kernel Created"), 500);
-        });
-
-        this.events.on('kernel_reconnecting.Kernel', function () {
-            knw.warning(i18n.msg._("Connecting to kernel"));
-        });
-
-        this.events.on('kernel_connection_dead.Kernel', function (evt, info) {
-            knw.danger(i18n.msg._("Not Connected"), undefined, function () {
-                // schedule reconnect a short time in the future, don't reconnect immediately
-                setTimeout($.proxy(info.kernel.reconnect, info.kernel), 500);
-            }, {title: i18n.msg._('click to reconnect')});
-        });
-
-        this.events.on('kernel_connected.Kernel', function () {
-            knw.info("Connected", 500);
-            // trigger busy in the status to clear broken-link state immediately
-            // a kernel_ready event will come when the kernel becomes responsive.
-            $kernel_ind_icon
-                .attr('class', 'kernel_busy_icon')
-                .attr('title', i18n.msg._('Kernel Connected'));
-        });
-
-        this.events.on('kernel_restarting.Kernel', function () {
-            that.save_widget.update_document_title();
-            knw.set_message(i18n.msg._("Restarting kernel"), 2000);
-        });
-
-        this.events.on('kernel_autorestarting.Kernel', function (evt, info) {
-            // Only show the dialog on the first restart attempt. This
-            // number gets tracked by the `Kernel` object and passed
-            // along here, because we don't want to show the user 5
-            // dialogs saying the same thing (which is the number of
-            // times it tries restarting).
-            if (info.attempt === 1) {
-
-                dialog.kernel_modal({
-                    notebook: that.notebook,
-                    keyboard_manager: that.keyboard_manager,
-                    title: i18n.msg._("Kernel Restarting"),
-                    body: i18n.msg._("The kernel appears to have died. It will restart automatically."),
-                    buttons: {
-                        OK : {
-                            class : "btn-primary"
-                        }
-                    }
-                });
-            }
-
-            that.save_widget.update_document_title();
-            knw.danger(i18n.msg._("Dead kernel"));
-            $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title',i18n.msg._('Kernel Dead'));
-        });
-
-        this.events.on('kernel_interrupting.Kernel', function () {
-            knw.set_message(i18n.msg._("Interrupting kernel"), 2000);
-        });
-
-        this.events.on('kernel_disconnected.Kernel', function () {
-            $kernel_ind_icon
-                .attr('class', 'kernel_disconnected_icon')
-                .attr('title', i18n.msg._('No Connection to Kernel'));
-        });
-
-        this.events.on('kernel_connection_failed.Kernel', function (evt, info) {
-            // only show the dialog if this is the first failed
-            // connect attempt, because the kernel will continue
-            // trying to reconnect and we don't want to spam the user
-            // with messages
-            if (info.attempt === 1) {
-
-                var msg = i18n.msg._("A connection to the notebook server could not be established." +
-                        " The notebook will continue trying to reconnect. Check your" +
-                        " network connection or notebook server configuration.");
-
-                var the_dialog = dialog.kernel_modal({
-                    title: i18n.msg._("Connection failed"),
-                    body: msg,
-                    keyboard_manager: that.keyboard_manager,
-                    notebook: that.notebook,
-                    buttons : {
-                        "OK": {}
-                    }
-                });
-
-                // hide the dialog on reconnect if it's still visible
-                var dismiss = function () {
-                    the_dialog.modal('hide');
-                }
-                that.events.on("kernel_connected.Kernel", dismiss);
-                the_dialog.on("hidden.bs.modal", function () {
-                    // clear handler on dismiss
-                    that.events.off("kernel_connected.Kernel", dismiss);
-                });
-            }
-        });
-
-        this.events.on('kernel_killed.Kernel kernel_killed.Session', function () {
-            that.save_widget.update_document_title();
-            knw.warning(i18n.msg._("No kernel"));
-            $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title',i18n.msg._('Kernel is not running'));
-        });
-
-        this.events.on('kernel_dead.Kernel', function () {
-        // This statement is used simply so that message extraction
-        // will pick up the strings.  The actual setting of the text
-        // for the button is in dialog.js.
-        var button_labels = [ i18n.msg._("Don't Restart"), i18n.msg._("Try Restarting Now"), i18n.msg._("OK")];
-
-            var showMsg = function () {
-
-                var msg = i18n.msg._('The kernel has died, and the automatic restart has failed.' +
-                        ' It is possible the kernel cannot be restarted. ' +
-                        'If you are not able to restart the kernel, you will still be able to save' +
-                        ' the notebook, but running code will no longer work until the notebook' +
-                        ' is reopened.');
-
-                dialog.kernel_modal({
-                    title: i18n.msg._("Dead kernel"),
-                    body : msg,
-                    keyboard_manager: that.keyboard_manager,
-                    notebook: that.notebook,
-                    default_button: "Don't Restart",
-                    buttons : {
-                        "Don't Restart": {},
-                        "Try Restarting Now": {
-                            class: "btn-danger",
-                            click: function () {
-                                that.notebook.start_session();
-                            }
-                        }
-                    }
-                });
-
-                return false;
-            };
-
-            that.save_widget.update_document_title();
-            knw.danger(i18n.msg._("Dead kernel"), undefined, showMsg);
-            $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title',i18n.msg._('Kernel Dead'));
-
-            showMsg();
-        });
-        
-        this.events.on("no_kernel.Kernel", function (evt, data) {
-            $("#kernel_indicator").find('.kernel_indicator_name').text(i18n.msg._("No Kernel"));
-        });
-
-        this.events.on('kernel_dead.Session', function (evt, info) {
-            var full = info.xhr.responseJSON.message;
-            var short = info.xhr.responseJSON.short_message || 'Kernel error';
-            var traceback = info.xhr.responseJSON.traceback;
-
-            var showMsg = function () {
-                var msg = $('<div/>').append($('<p/>').text(full));
-                var cm, cm_elem, cm_open;
-
-                if (traceback) {
-                    cm_elem = $('<div/>')
-                        .css('margin-top', '1em')
-                        .css('padding', '1em')
-                        .addClass('output_scroll');
-                    msg.append(cm_elem);
-                    cm = new CodeMirror(cm_elem.get(0), {
-                        mode:  "python",
-                        readOnly : true
-                    });
-                    cm.setValue(traceback);
-                    cm_open = $.proxy(cm.refresh, cm);
-                }
-
-                dialog.kernel_modal({
-                    title: i18n.msg._("Failed to start the kernel"),
-                    body : msg,
-                    keyboard_manager: that.keyboard_manager,
-                    notebook: that.notebook,
-                    open: cm_open,
-                    buttons : {
-                        "OK": { class: 'btn-primary' }
-                    }
-                });
-
-                return false;
-            };
-
-            that.save_widget.update_document_title();
-            $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title',i18n.msg._('Kernel Dead'));
-            knw.danger(short, undefined, showMsg);
-        });
-        
-        this.events.on('kernel_starting.Kernel kernel_created.Session', function () {
-            // window.document.title='(Starting) '+window.document.title;
-            $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title',i18n.msg._('Kernel Busy'));
-            knw.set_message(i18n.msg._("Kernel starting, please wait..."));
-            set_busy_favicon(true);
-        });
-
-        this.events.on('kernel_ready.Kernel', function () {
-            // that.save_widget.update_document_title();
-            $kernel_ind_icon.attr('class','kernel_idle_icon').attr('title',i18n.msg._('Kernel Idle'));
-            knw.info(i18n.msg._("Kernel ready"), 500);
-            set_busy_favicon(false);
-        });
-
-        this.events.on('kernel_idle.Kernel', function () {
-            // that.save_widget.update_document_title();
-            $kernel_ind_icon.attr('class','kernel_idle_icon').attr('title',i18n.msg._('Kernel Idle'));
-            set_busy_favicon(false);
-        });
-
-        this.events.on('kernel_busy.Kernel', function () {
-            // window.document.title='(Busy) '+window.document.title;
-            $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title',i18n.msg._('Kernel Busy'));
-            set_busy_favicon(true);
-        });
-
-        this.events.on('spec_match_found.Kernel', function (evt, data) {
-            that.widget('kernelspec').info(i18n.msg._("Using kernel: ") + data.found.spec.display_name, 3000, undefined, {
-                title: i18n.msg.sprintf(i18n.msg._("Only candidate for language: %1$s was %2$s."),
-                        data.selected.language, data.found.spec.display_name)
-            });
-        });
-
-        
-        // Start the kernel indicator in the busy state, and send a kernel_info request.
-        // When the kernel_info reply arrives, the kernel is idle.
-        $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title',i18n.msg._('Kernel Busy'));
-    };
-
-    /**
-     * Initialize the notification widget for notebook status messages.
-     *
-     * @method init_notebook_notification_widget
-     */
-    NotebookNotificationArea.prototype.init_notebook_notification_widget = function () {
-        var nnw = this.widget('notebook');
-
-        // Notebook events
-        this.events.on('notebook_loading.Notebook', function () {
-            nnw.set_message(i18n.msg._("Loading notebook"),500);
-        });
-        this.events.on('notebook_loaded.Notebook', function () {
-            nnw.set_message(i18n.msg._("Notebook loaded"),500);
-        });
-        this.events.on('notebook_saving.Notebook', function () {
-            nnw.set_message(i18n.msg._("Saving notebook"),500);
-        });
-        this.events.on('notebook_saved.Notebook', function () {
-            nnw.set_message(i18n.msg._("Notebook saved"),2000);
-        });
-        this.events.on('notebook_save_failed.Notebook', function (evt, error) {
-            nnw.warning(error.message || i18n.msg._("Notebook save failed"));
-        });
-        this.events.on('notebook_copy_failed.Notebook', function (evt, error) {
-            nnw.warning(error.message || i18n.msg._("Notebook copy failed"));
-        });
-        
-        // Checkpoint events
-        this.events.on('checkpoint_created.Notebook', function (evt, data) {
-            var msg = i18n.msg._("Checkpoint created");
-            if (data.last_modified) {
-                var d = new Date(data.last_modified);
-                msg = msg + ": " + moment(d).format("HH:mm:ss");
-            }
-            nnw.set_message(msg, 2000);
-        });
-        this.events.on('checkpoint_failed.Notebook', function () {
-            nnw.warning(i18n.msg._("Checkpoint failed"));
-        });
-        this.events.on('checkpoint_deleted.Notebook', function () {
-            nnw.set_message(i18n.msg._("Checkpoint deleted"), 500);
-        });
-        this.events.on('checkpoint_delete_failed.Notebook', function () {
-            nnw.warning(i18n.msg._("Checkpoint delete failed"));
-        });
-        this.events.on('checkpoint_restoring.Notebook', function () {
-            nnw.set_message(i18n.msg._("Restoring to checkpoint..."), 500);
-        });
-        this.events.on('checkpoint_restore_failed.Notebook', function () {
-            nnw.warning(i18n.msg._("Checkpoint restore failed"));
-        });
-
-        // Autosave events
-        this.events.on('autosave_disabled.Notebook', function () {
-            nnw.set_message(i18n.msg._("Autosave disabled"), 2000);
-        });
-        this.events.on('autosave_enabled.Notebook', function (evt, interval) {
-            nnw.set_message(i18n.msg.sprintf(i18n.msg._("Saving every %d sec."), interval / 1000) , 1000);
-        });
-    };
-
-    /**
-     * Initialize the notification widget for trusted notebook messages.
-     *
-     * @method init_trusted_notebook_notification_widget
-     */
-    NotebookNotificationArea.prototype.init_trusted_notebook_notification_widget = function () {
-        var that = this;
-        var tnw = this.widget('trusted');
-
-        // Notebook trust events
-        this.events.on('trust_changed.Notebook', function (event, trusted) {
-            if (trusted) {
-                tnw.set_message(i18n.msg._("Trusted"), undefined, function() {
-                  return false;
-                }, {'title':'Javascript enabled for notebook display'});
-                // don't allow 'Trusted' button to be clicked
-                $(tnw.selector).attr('disabled', true);
-                $(tnw.selector).css('cursor', 'help');
-            } else {
-                tnw.set_message(i18n.msg._("Not Trusted"), undefined, function() {
-                  that.notebook.trust_notebook("#notification_trusted");
-                  return false;
-                }, {'title':'Javascript disabled for notebook display'});
-                $(tnw.selector).attr('role', 'button');
-            }
-        });
-    };
-
-    return {'NotebookNotificationArea': NotebookNotificationArea};
-});
diff --git a/notebook/static/notebook/js/outputarea.js b/notebook/static/notebook/js/outputarea.js
deleted file mode 100644
index 2dd65a288..000000000
--- a/notebook/static/notebook/js/outputarea.js
+++ /dev/null
@@ -1,1129 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/security',
-    'base/js/keyboard',
-    'base/js/markdown',
-    'services/config',
-], function($, utils, i18n, security, keyboard, markdown, configmod) {
-    "use strict";
-
-    /**
-     * @class OutputArea
-     *
-     * @constructor
-     */
-
-    var OutputArea = function (options) {
-        this.config = options.config;
-        this.selector = options.selector;
-        this.events = options.events;
-        this.keyboard_manager = options.keyboard_manager;
-        this.wrapper = $(options.selector);
-        this.outputs = [];
-        this.collapsed = false;
-        this.scrolled = false;
-        this.scroll_state = 'auto';
-        this.trusted = true;
-        this.clear_queued = null;
-        if (options.prompt_area === undefined) {
-            this.prompt_area = true;
-        } else {
-            this.prompt_area = options.prompt_area;
-        }
-        this._display_id_targets = {};
-        this.create_elements();
-        this.style();
-        this.bind_events();
-        this.class_config = new configmod.ConfigWithDefaults(this.config,
-                                        OutputArea.config_defaults, 'OutputArea');
-
-        this.handle_appended = utils.throttle(this.handle_appended.bind(this));
-    };
-
-    OutputArea.config_defaults = {
-        stream_chunk_size: 8192, // chunk size for stream output
-    };
-
-    /**
-     * Class prototypes
-     **/
-
-    OutputArea.prototype.create_elements = function () {
-        var element = this.element = $("<div/>");
-        // wrap element in safe trigger,
-        // so that errors (e.g. in widget extensions) are logged instead of
-        // breaking everything.
-        this.element._original_trigger = this.element.trigger;
-        this.element.trigger = function (name, data) {
-            try {
-                this._original_trigger.apply(this, arguments);
-            } catch (e) {
-                console.error("Exception in event handler for " + name, e, arguments);
-            }
-        }
-        this.collapse_button = $("<div/>");
-        this.prompt_overlay = $("<div/>");
-        this.wrapper.append(this.prompt_overlay);
-        this.wrapper.append(this.element);
-        this.wrapper.append(this.collapse_button);
-    };
-
-
-    OutputArea.prototype.style = function () {
-        this.collapse_button.hide();
-        if (!this.prompt_area) {
-            this.prompt_overlay.hide();
-        }
-
-        this.wrapper.addClass('output_wrapper');
-        this.element.addClass('output');
-
-        this.collapse_button.addClass("btn btn-default output_collapsed");
-        this.collapse_button.attr('title', i18n.msg._('click to expand output'));
-        this.collapse_button.text('. . .');
-
-        this.prompt_overlay.addClass('out_prompt_overlay prompt');
-        this.prompt_overlay.attr('title', i18n.msg._('click to expand output; double click to hide output'));
-
-        this.expand();
-    };
-
-    /**
-     * Should the OutputArea scroll?
-     * Returns whether the height (in lines) exceeds the current threshold.
-     * Threshold will be OutputArea.minimum_scroll_threshold if scroll_state=true (manually requested)
-     * or OutputArea.auto_scroll_threshold if scroll_state='auto'.
-     * This will always return false if scroll_state=false (scroll disabled).
-     *
-     */
-    OutputArea.prototype._should_scroll = function () {
-        var threshold;
-        if (this.scroll_state === false) {
-            return false;
-        } else if (this.scroll_state === true) {
-            threshold = OutputArea.minimum_scroll_threshold;
-        } else {
-            threshold = OutputArea.auto_scroll_threshold;
-        }
-        if (threshold <=0) {
-            return false;
-        }
-        // line-height from https://stackoverflow.com/questions/1185151
-        var fontSize = this.element.css('font-size') || '14px';
-        var lineHeight = Math.floor((parseFloat(fontSize.replace('px','')) || 14) * 1.3);
-        return (this.element.height() > threshold * lineHeight);
-    };
-
-
-    OutputArea.prototype.bind_events = function () {
-        var that = this;
-        this.prompt_overlay.dblclick(function () { that.toggle_output(); });
-        this.prompt_overlay.click(function () { that.toggle_scroll(); });
-
-        this.element.on('resizeOutput', function () {
-            // maybe scroll output,
-            // if it's grown large enough and hasn't already been scrolled.
-            if (!that.scrolled && that._should_scroll()) {
-                that.scroll_area();
-            }
-        });
-        this.collapse_button.click(function () {
-            that.expand();
-        });
-    };
-
-
-    OutputArea.prototype.collapse = function () {
-        if (!this.collapsed) {
-            this.element.hide();
-            this.prompt_overlay.hide();
-            if (this.element.html()){
-                this.collapse_button.show();
-            }
-            this.collapsed = true;
-            // collapsing output clears scroll state
-            this.scroll_state = 'auto';
-        }
-    };
-
-
-    OutputArea.prototype.expand = function () {
-        if (this.collapsed) {
-            this.collapse_button.hide();
-            this.element.show();
-            if (this.prompt_area) {
-                this.prompt_overlay.show();
-            }
-            this.collapsed = false;
-            this.scroll_if_long();
-        }
-    };
-
-
-    OutputArea.prototype.toggle_output = function () {
-        if (this.collapsed) {
-            this.expand();
-        } else {
-            this.collapse();
-        }
-    };
-
-
-    OutputArea.prototype.scroll_area = function () {
-        this.element.addClass('output_scroll');
-        this.prompt_overlay.attr('title', i18n.msg._('click to unscroll output; double click to hide'));
-        this.scrolled = true;
-    };
-
-
-    OutputArea.prototype.unscroll_area = function () {
-        this.element.removeClass('output_scroll');
-        this.prompt_overlay.attr('title', i18n.msg._('click to scroll output; double click to hide'));
-        this.scrolled = false;
-    };
-
-    /**
-     * Scroll OutputArea if height exceeds a threshold.
-     *
-     * Threshold is OutputArea.minimum_scroll_threshold if scroll_state = true,
-     * OutputArea.auto_scroll_threshold if scroll_state='auto'.
-     *
-     **/
-    OutputArea.prototype.scroll_if_long = function () {
-        var should_scroll = this._should_scroll();
-        if (!this.scrolled && should_scroll) {
-            // only allow scrolling long-enough output
-            this.scroll_area();
-        } else if (this.scrolled && !should_scroll) {
-            // scrolled and shouldn't be
-            this.unscroll_area();
-        }
-    };
-
-
-    OutputArea.prototype.toggle_scroll = function () {
-        if (this.scroll_state == 'auto') {
-            this.scroll_state = !this.scrolled;
-        } else {
-            this.scroll_state = !this.scroll_state;
-        }
-        if (this.scrolled) {
-            this.unscroll_area();
-        } else {
-            // only allow scrolling long-enough output
-            this.scroll_if_long();
-        }
-    };
-
-
-    // typeset with MathJax if MathJax is available
-    OutputArea.prototype.typeset = function () {
-        utils.typeset(this.element);
-    };
-
-
-    OutputArea.prototype.handle_output = function (msg) {
-        var json = {};
-        var msg_type = json.output_type = msg.header.msg_type;
-        var content = msg.content;
-        switch(msg_type) {
-        case "stream" :
-            json.text = content.text;
-            json.name = content.name;
-            break;
-        case "execute_result":
-            json.execution_count = content.execution_count;
-        case "update_display_data":
-        case "display_data":
-            json.transient = content.transient;
-            json.data = content.data;
-            json.metadata = content.metadata;
-            break;
-        case "error":
-            json.ename = content.ename;
-            json.evalue = content.evalue;
-            json.traceback = content.traceback;
-            break;
-        default:
-            console.error("unhandled output message", msg);
-            return;
-        }
-        this.append_output(json);
-    };
-
-    // Declare mime type as constants
-    var MIME_JAVASCRIPT = 'application/javascript';
-    var MIME_HTML = 'text/html';
-    var MIME_MARKDOWN = 'text/markdown';
-    var MIME_LATEX = 'text/latex';
-    var MIME_SVG = 'image/svg+xml';
-    var MIME_PNG = 'image/png';
-    var MIME_JPEG = 'image/jpeg';
-    var MIME_GIF = 'image/gif';
-    var MIME_PDF = 'application/pdf';
-    var MIME_TEXT = 'text/plain';
-
-
-    OutputArea.output_types = [
-        MIME_JAVASCRIPT,
-        MIME_HTML,
-        MIME_MARKDOWN,
-        MIME_LATEX,
-        MIME_SVG,
-        MIME_PNG,
-        MIME_JPEG,
-        MIME_GIF,
-        MIME_PDF,
-        MIME_TEXT,
-    ];
-
-    OutputArea.prototype.validate_mimebundle = function (bundle) {
-        /** scrub invalid outputs */
-        if (typeof bundle.data !== 'object') {
-            console.warn("mimebundle missing data", bundle);
-            bundle.data = {};
-        }
-        if (typeof bundle.metadata !== 'object') {
-            console.warn("mimebundle missing metadata", bundle);
-            bundle.metadata = {};
-        }
-        var data = bundle.data;
-        $.map(OutputArea.output_types, function(key){
-            if ((key.indexOf('application/') === -1 || key.indexOf('json') === -1) &&
-                data[key] !== undefined &&
-                typeof data[key] !== 'string'
-            ) {
-                console.log("Invalid type for " + key, data[key]);
-                delete data[key];
-            }
-        });
-        return bundle;
-    };
-
-    OutputArea.prototype.append_output = function (json) {
-        this.expand();
-
-        if (this.clear_queued) {
-            this.clear_output(false);
-            this._needs_height_reset = true;
-        }
-
-        var record_output = true;
-        switch(json.output_type) {
-            case 'update_display_data':
-                record_output = false;
-                json = this.validate_mimebundle(json);
-                this.update_display_data(json);
-                return;
-            case 'execute_result':
-                json = this.validate_mimebundle(json);
-                this.append_execute_result(json);
-                break;
-            case 'stream':
-                // append_stream might have merged the output with earlier stream output
-                record_output = this.append_stream(json);
-                break;
-            case 'error':
-                this.append_error(json);
-                break;
-            case 'display_data':
-                // append handled below
-                json = this.validate_mimebundle(json);
-                break;
-            default:
-                console.log("unrecognized output type: " + json.output_type);
-                this.append_unrecognized(json);
-        }
-
-        if (json.output_type === 'display_data') {
-            var that = this;
-            this.append_display_data(json, this.handle_appended);
-        } else {
-            this.handle_appended();
-        }
-
-        if (record_output) {
-            this.outputs.push(json);
-        }
-
-        this.events.trigger('output_added.OutputArea', {
-            output: json,
-            output_area: this,
-        });
-    };
-
-    OutputArea.prototype.handle_appended = function () {
-        if (this._needs_height_reset) {
-            this.element.height('');
-            this._needs_height_reset = false;
-        }
-
-        this.element.trigger('resizeOutput', {output_area: this});
-    };
-
-    OutputArea.prototype.create_output_area = function () {
-        var oa = $("<div/>").addClass("output_area");
-        if (this.prompt_area) {
-            oa.append($('<div/>').addClass('run_this_cell'));
-            oa.append($('<div/>').addClass('prompt'));
-        }
-        return oa;
-    };
-
-
-    function _get_metadata_key(metadata, key, mime) {
-        var mime_md = metadata[mime];
-        // mime-specific higher priority
-        if (mime_md && mime_md[key] !== undefined) {
-            return mime_md[key];
-        }
-        // fallback on global
-        return metadata[key];
-    }
-
-    OutputArea.prototype.create_output_subarea = function(md, classes, mime) {
-        var subarea = $('<div/>').addClass('output_subarea').addClass(classes);
-        // Unforce RTL
-        subarea.attr("dir","auto");
-        if (_get_metadata_key(md, 'isolated', mime)) {
-            // Create an iframe to isolate the subarea from the rest of the
-            // document
-            var iframe = $('<iframe/>').addClass('box-flex1');
-            iframe.css({'height':1, 'width':'100%', 'display':'block'});
-            iframe.attr('frameborder', 0);
-            iframe.attr('scrolling', 'auto');
-
-            // Once the iframe is loaded, the subarea is dynamically inserted
-            iframe.on('load', function() {
-                // Workaround needed by Firefox, to properly render svg inside
-                // iframes, see https://stackoverflow.com/questions/10177190/
-                // svg-dynamically-added-to-iframe-does-not-render-correctly
-                this.contentDocument.open();
-
-                // Insert the subarea into the iframe
-                // We must directly write the html. When using Jquery's append
-                // method, javascript is evaluated in the parent document and
-                // not in the iframe document.  At this point, subarea doesn't
-                // contain any user content.
-                this.contentDocument.write(subarea.html());
-
-                this.contentDocument.close();
-
-                var body = this.contentDocument.body;
-                // Adjust the iframe height automatically
-                iframe.height(body.scrollHeight + 'px');
-            });
-
-            // Elements should be appended to the inner subarea and not to the
-            // iframe
-            iframe.append = function(that) {
-                subarea.append(that);
-            };
-
-            return iframe;
-        } else {
-            return subarea;
-        }
-    };
-
-
-    OutputArea.prototype._append_javascript_error = function (err, element) {
-        /**
-         * display a message when a javascript error occurs in display output
-         */
-        var msg = i18n.msg._("Javascript error adding output!");
-        if ( element === undefined ) return;
-        element
-            .append($('<div/>').text(msg).addClass('js-error'))
-            .append($('<div/>').text(err.toString()).addClass('js-error'))
-            .append($('<div/>').text(i18n.msg._('See your browser Javascript console for more details.')).addClass('js-error'));
-    };
-
-    OutputArea.prototype._safe_append = function (toinsert, toreplace) {
-        /**
-         * safely append an item to the document
-         * this is an object created by user code,
-         * and may have errors, which should not be raised
-         * under any circumstances.
-         */
-        try {
-            if (toreplace) {
-                toreplace.replaceWith(toinsert);
-            } else {
-                this.element.append(toinsert);
-            }
-        } catch(err) {
-            console.error(err);
-            // Create an actual output_area and output_subarea, which creates
-            // the prompt area and the proper indentation.
-            toinsert = this.create_output_area();
-            var subarea = $('<div/>').addClass('output_subarea');
-            // Unforce RTL
-            subarea.attr("dir","auto");
-            toinsert.append(subarea);
-            this._append_javascript_error(err, subarea);
-            this.element.append(toinsert);
-        }
-
-        // Notify others of changes.
-        this.element.trigger('changed', {output_area: this});
-    };
-
-    OutputArea.output_prompt_classical = function(prompt_value) {
-        return $('<bdi>').text(i18n.msg.sprintf(i18n.msg._('Out[%s]:'),prompt_value));
-    };
-
-    OutputArea.output_prompt_function = OutputArea.output_prompt_classical;
-
-    OutputArea.prototype.append_execute_result = function (json) {
-        var n = json.execution_count || ' ';
-        var toinsert = this.create_output_area();
-        this._record_display_id(json, toinsert);
-        if (this.prompt_area) {
-            toinsert.find('div.prompt')
-                    .addClass('output_prompt')
-                    .empty()
-                    .append(OutputArea.output_prompt_function(n));
-        }
-        var inserted = this.append_mime_type(json, toinsert);
-        if (inserted) {
-            inserted.addClass('output_result');
-        }
-        this._safe_append(toinsert);
-        // If we just output latex, typeset it.
-        if ((json.data[MIME_LATEX] !== undefined) ||
-            (json.data[MIME_HTML] !== undefined) ||
-            (json.data[MIME_MARKDOWN] !== undefined)) {
-            this.typeset();
-        }
-    };
-
-
-    OutputArea.prototype.append_error = function (json) {
-        var tb = json.traceback;
-        if (tb !== undefined && tb.length > 0) {
-            var s = '';
-            var len = tb.length;
-            for (var i=0; i<len; i++) {
-                s = s + tb[i] + '\n';
-            }
-            s = s + '\n';
-            var toinsert = this.create_output_area();
-            var append_text = OutputArea.append_map[MIME_TEXT];
-            if (append_text) {
-                append_text.apply(this, [s, {}, toinsert]).addClass('output_error');
-            }
-            this._safe_append(toinsert);
-        }
-    };
-
-
-    OutputArea.prototype.append_stream = function (json) {
-        var text = json.text;
-        if (typeof text !== 'string') {
-            console.error("Stream output is invalid (missing text)", json);
-            return false;
-        }
-        var subclass = "output_"+json.name;
-
-        if (this.outputs.length > 0){
-            // have at least one output to consider
-            var last = this.outputs[this.outputs.length-1];
-            if (last.output_type == 'stream' && json.name == last.name){
-                if (last.text.length > this.class_config.get_sync('stream_chunk_size')) {
-                    // don't keep extending long blocks
-                    var last_newline_idx = last.text.lastIndexOf('\n');
-                    // if the last stream output doesn't end on a newline,
-                    // split on last newline and take the tail with the new output
-                    if (last_newline_idx !== -1 && last_newline_idx !== last.text.length - 1) {
-                        // truncate last.text to its last newline,
-                        // and take the tail with the new output.
-                        var tail = last.text.slice(last_newline_idx + 1);
-                        last.text = last.text.slice(0, last_newline_idx + 1);
-                        // we changed last's content, so we have to re-render it
-                        text = json.text = tail + json.text;
-                        var pre = this.element.find('div.'+subclass).last().find('pre');
-                        var html = utils.fixConsole(last.text);
-                        html = utils.autoLinkUrls(html);
-                        pre.html(html);
-                    }
-                } else {
-                    // latest output was in the same stream,
-                    // so append to it instead of making a new output.
-                    // escape ANSI & HTML specials:
-                    last.text = utils.fixOverwrittenChars(last.text + json.text);
-                    var pre = this.element.find('div.'+subclass).last().find('pre');
-                    var html = utils.fixConsole(last.text);
-                    html = utils.autoLinkUrls(html);
-                    // The only user content injected with this HTML call is
-                    // escaped by the fixConsole() method.
-                    pre.html(html);
-                    // return false signals that we merged this output with the previous one,
-                    // and the new output shouldn't be recorded.
-                    return false;
-                }
-            }
-        }
-
-        if (!text.replace("\r", "")) {
-            // text is nothing (empty string, \r, etc.)
-            // so don't append any elements, which might add undesirable space
-            // return true to indicate the output should be recorded.
-            return true;
-        }
-
-        // If we got here, attach a new div
-        var toinsert = this.create_output_area();
-        var append_text = OutputArea.append_map[MIME_TEXT];
-        if (append_text) {
-            append_text.apply(this, [text, {}, toinsert]).addClass("output_stream " + subclass);
-        }
-        this._safe_append(toinsert);
-        return true;
-    };
-
-
-    OutputArea.prototype.append_unrecognized = function (json) {
-        var that = this;
-        var toinsert = this.create_output_area();
-        var subarea = $('<div/>').addClass('output_subarea output_unrecognized');
-        // Unforce RTL
-        subarea.attr("dir","auto");
-        toinsert.append(subarea);
-        subarea.append(
-            $("<a>")
-                .attr("href", "#")
-                .text(i18n.msg.sprintf(i18n.msg._("Unrecognized output: %s"),json.output_type))
-                .click(function () {
-                    that.events.trigger('unrecognized_output.OutputArea', {output: json});
-                })
-        );
-        this._safe_append(toinsert);
-    };
-
-
-    OutputArea.prototype.update_display_data = function (json, handle_inserted) {
-        var oa = this;
-        var targets;
-        var display_id = (json.transient || {}).display_id;
-        if (!display_id) {
-            console.warn("Handling update_display with no display_id", json);
-            return;
-        }
-        targets = this._display_id_targets[display_id];
-        if (!targets) {
-            console.warn("No targets for display_id", display_id, json);
-            return;
-        }
-        // we've seen it before, update output data
-        targets.map(function (target) {
-            oa.outputs[target.index].data = json.data;
-            oa.outputs[target.index].metadata = json.metadata;
-            var toinsert = oa.create_output_area();
-            if (oa.append_mime_type(json, toinsert, handle_inserted)) {
-                oa._safe_append(toinsert, target.element);
-            }
-            target.element = toinsert;
-        });
-
-        // If we just output something that could contain latex, typeset it.
-        if ((json.data[MIME_LATEX] !== undefined) ||
-            (json.data[MIME_HTML] !== undefined) ||
-            (json.data[MIME_MARKDOWN] !== undefined)) {
-            this.typeset();
-        }
-        this.events.trigger('output_updated.OutputArea', {
-            output: json,
-            output_area: this,
-        });
-    };
-
-    OutputArea.prototype._record_display_id = function (json, element) {
-        // record display_id of a display_data / execute_result
-        var display_id = (json.transient || {}).display_id;
-        if (!display_id) return;
-        // it has a display_id;
-        var targets = this._display_id_targets[display_id];
-        if (!targets) {
-            targets = this._display_id_targets[display_id] = [];
-        }
-        targets.push({
-            index: this.outputs.length,
-            element: element,
-        });
-    };
-
-    OutputArea.prototype.append_display_data = function (json, handle_inserted) {
-        var toinsert = this.create_output_area();
-        this._record_display_id(json, toinsert);
-        if (this.append_mime_type(json, toinsert, handle_inserted)) {
-            this._safe_append(toinsert);
-            // If we just output latex, typeset it.
-            if ((json.data[MIME_LATEX] !== undefined) ||
-                (json.data[MIME_HTML] !== undefined) ||
-                (json.data[MIME_MARKDOWN] !== undefined)) {
-                this.typeset();
-            }
-        }
-    };
-
-    OutputArea.safe_outputs = {};
-    OutputArea.safe_outputs[MIME_TEXT] = true;
-    OutputArea.safe_outputs[MIME_LATEX] = true;
-    OutputArea.safe_outputs[MIME_PNG] = true;
-    OutputArea.safe_outputs[MIME_JPEG] = true;
-    OutputArea.safe_outputs[MIME_GIF] = true;
-
-    OutputArea.prototype.append_mime_type = function (json, element, handle_inserted) {
-        for (var i=0; i < OutputArea.display_order.length; i++) {
-            var type = OutputArea.display_order[i];
-            var append = OutputArea.append_map[type];
-            if ((json.data[type] !== undefined) && append) {
-                var md = json.metadata || {};
-                var value = json.data[type];
-                var toinsert;
-
-                try {
-                    if (!this.trusted && !OutputArea.safe_outputs[type]) {
-                        // not trusted, sanitize HTML
-                        if (type===MIME_HTML || type==='text/svg') {
-                            var parsed = $(security.sanitize_html_and_parse(value));
-                            toinsert = append.apply(this, [parsed, md, element, handle_inserted]);
-                        } else {
-                            // don't display if we don't know how to sanitize it
-                            console.log("Ignoring untrusted " + type + " output.");
-                            continue;
-                        }
-                    } else {
-                        toinsert = append.apply(this, [value, md, element, handle_inserted]);
-                    }
-                } catch (e) {
-                    console.error('Failed to render mimetype "' + type + '" with: ', e);
-                    continue;
-                }
-
-                // Since only the png and jpeg mime types call the inserted
-                // callback, if the mime type is something other we must call the
-                // inserted callback only when the element is actually inserted
-                // into the DOM.  Use a timeout of 0 to do this.
-                if ([MIME_PNG, MIME_JPEG, MIME_GIF].indexOf(type) < 0 && handle_inserted !== undefined) {
-                    setTimeout(handle_inserted, 0);
-                }
-                this.events.trigger('output_appended.OutputArea', [type, value, md, toinsert]);
-                return toinsert;
-            }
-        }
-
-        return null;
-    };
-
-
-    var append_html = function (html, md, element) {
-        var type = MIME_HTML;
-        var toinsert = this.create_output_subarea(md, "output_html rendered_html", type);
-        this.keyboard_manager.register_events(toinsert);
-        toinsert.append(html);
-        dblclick_to_reset_size(toinsert.find('img'));
-        element.append(toinsert);
-        return toinsert;
-    };
-
-
-    var append_markdown = function(text, md, element) {
-        var type = MIME_MARKDOWN;
-        var toinsert = this.create_output_subarea(md, "output_markdown rendered_html", type);
-        markdown.render(text, {
-            with_math: true,
-            clean_tables: true
-        }, function (err, html) {
-            toinsert.append(html);
-        });
-        dblclick_to_reset_size(toinsert.find('img'));
-        element.append(toinsert);
-        return toinsert;
-    };
-
-
-    var append_javascript = function (js, md, element) {
-        /**
-         * We just eval the JS code, element appears in the local scope.
-         */
-        var type = MIME_JAVASCRIPT;
-        var toinsert = this.create_output_subarea(md, "output_javascript rendered_html", type);
-        this.keyboard_manager.register_events(toinsert);
-        element.append(toinsert);
-
-        // Fix for ipython/issues/5293, make sure `element` is the area which
-        // output can be inserted into at the time of JS execution.
-        element = toinsert;
-        try {
-            eval(js);
-        } catch(err) {
-            console.log(err);
-            this._append_javascript_error(err, toinsert);
-        }
-        return toinsert;
-    };
-
-
-    var append_text = function (data, md, element) {
-        var type = MIME_TEXT;
-        var toinsert = this.create_output_subarea(md, "output_text", type);
-        data = utils.fixOverwrittenChars(data);
-        // escape ANSI & HTML specials in plaintext:
-        data = utils.fixConsole(data);
-        data = utils.autoLinkUrls(data);
-        // The only user content injected with this HTML call is
-        // escaped by the fixConsole() method.
-        toinsert.append($("<pre/>").html(data));
-        element.append(toinsert);
-        return toinsert;
-    };
-
-
-    var append_svg = function (svg_html, md, element) {
-        var type = MIME_SVG;
-        var toinsert = this.create_output_subarea(md, "output_svg", type);
-
-        // Get the svg element from within the HTML.
-        // One svg is supposed, but could embed other nested svgs
-        var svg = $($('<div \>').html(svg_html).find('svg')[0]);
-        var svg_area = $('<div />');
-        var width = svg.attr('width');
-        var height = svg.attr('height');
-        svg
-            .width('100%')
-            .height('100%');
-        svg_area
-            .width(width)
-            .height(height);
-
-        svg_area.append(svg);
-        toinsert.append(svg_area);
-        element.append(toinsert);
-
-        return toinsert;
-    };
-
-    function dblclick_to_reset_size (img) {
-        /**
-         * Double-click on an image toggles confinement to notebook width
-         *
-         * img: jQuery element
-         */
-
-        img.dblclick(function () {
-            // dblclick toggles *raw* size, disabling max-width confinement.
-            if (img.hasClass('unconfined')) {
-                img.removeClass('unconfined');
-            } else {
-                img.addClass('unconfined');
-            }
-        });
-    }
-
-    var set_width_height = function (img, md, mime) {
-        /**
-         * set width and height of an img element from metadata
-         */
-        var height = _get_metadata_key(md, 'height', mime);
-        if (height !== undefined) img.attr('height', height);
-        var width = _get_metadata_key(md, 'width', mime);
-        if (width !== undefined) img.attr('width', width);
-        if (_get_metadata_key(md, 'unconfined', mime)) {
-            img.addClass('unconfined');
-        }
-    };
-
-    OutputArea.prototype._append_img = function (src_type, md, element, handle_inserted, MIME, type_string) {
-        var type = MIME;
-        var toinsert = this.create_output_subarea(md, 'output_' + type_string, type);
-        var img = $("<img/>");
-        if (handle_inserted !== undefined) {
-            img.on('load', function(){
-                handle_inserted(img);
-            });
-        }
-        img[0].src = 'data:image/' + type_string + ';base64,'+ src_type;
-        set_width_height(img, md, type);
-        dblclick_to_reset_size(img);
-        toinsert.append(img);
-        element.append(toinsert);
-        return toinsert;
-    };
-
-    var append_png = function (png, md, element, handle_inserted) {
-        return this._append_img(png, md, element, handle_inserted, MIME_PNG, 'png');
-    };
-
-    var append_jpeg = function (jpeg, md, element, handle_inserted) {
-        return this._append_img(jpeg, md, element, handle_inserted, MIME_JPEG, 'jpeg');
-    };
-
-    var append_gif = function (gif, md, element, handle_inserted) {
-        return this._append_img(gif, md, element, handle_inserted, MIME_GIF, 'gif');
-    };
-
-    var append_pdf = function (pdf, md, element) {
-        var type = MIME_PDF;
-        var toinsert = this.create_output_subarea(md, "output_pdf", type);
-        var a = $('<a/>').attr('href', 'data:application/pdf;base64,'+pdf);
-        a.attr('target', '_blank');
-        a.text('View PDF');
-        toinsert.append(a);
-        element.append(toinsert);
-        return toinsert;
-     };
-
-    var append_latex = function (latex, md, element) {
-        /**
-         * This method cannot do the typesetting because the latex first has to
-         * be on the page.
-         */
-        var type = MIME_LATEX;
-        var toinsert = this.create_output_subarea(md, "output_latex", type);
-        toinsert.text(latex);
-        element.append(toinsert);
-        return toinsert;
-    };
-
-    OutputArea.prototype.append_raw_input = function (msg) {
-        var that = this;
-        this.expand();
-        var content = msg.content;
-        var area = this.create_output_area();
-
-        // disable any other raw_inputs, if they are left around
-        $("div.output_subarea.raw_input_container").remove();
-
-        var input_type = content.password ? 'password' : 'text';
-
-        area.append(
-            $("<div/>")
-            .addClass("box-flex1 output_subarea raw_input_container")
-            .append(
-                $("<pre/>")
-                .addClass("raw_input_prompt")
-                .html(utils.fixConsole(content.prompt))
-                .append(
-                    $("<input/>")
-                    .addClass("raw_input")
-                    .attr('type', input_type)
-                    .attr("size", 47)
-                    .keydown(function (event, ui) {
-                        // make sure we submit on enter,
-                        // and don't re-execute the *cell* on shift-enter
-                        if (event.which === keyboard.keycodes.enter) {
-                            that._submit_raw_input();
-                            return false;
-                        }
-                    })
-                )
-            )
-            .attr("dir","auto")
-        );
-
-        this.element.append(area);
-        var raw_input = area.find('input.raw_input');
-        // Register events that enable/disable the keyboard manager while raw
-        // input is focused.
-        this.keyboard_manager.register_events(raw_input);
-        // Note, the following line used to read raw_input.focus().focus().
-        // This seemed to be needed otherwise only the cell would be focused.
-        // But with the modal UI, this seems to work fine with one call to focus().
-        raw_input.focus();
-    };
-
-    OutputArea.prototype._submit_raw_input = function (evt) {
-        var container = this.element.find("div.raw_input_container");
-        var theprompt = container.find("pre.raw_input_prompt");
-        var theinput = container.find("input.raw_input");
-        var value = theinput.val();
-        var echo  = value;
-        // don't echo if it's a password
-        if (theinput.attr('type') == 'password') {
-            echo = '········';
-        }
-        var content = {
-            output_type : 'stream',
-            name : 'stdout',
-            text : theprompt.text() + echo + '\n'
-        };
-        // remove form container
-        container.parent().remove();
-        // replace with plaintext version in stdout
-        this.append_output(content);
-        this.events.trigger('send_input_reply.Kernel', value);
-    };
-
-
-    OutputArea.prototype.handle_clear_output = function (msg) {
-        /**
-         * msg spec v4 had stdout, stderr, display keys
-         * v4.1 replaced these with just wait
-         * The default behavior is the same (stdout=stderr=display=True, wait=False),
-         * so v4 messages will still be properly handled,
-         * except for the rarely used clearing less than all output.
-         */
-        this.clear_output(msg.content.wait || false);
-    };
-
-
-    OutputArea.prototype.clear_output = function(wait, ignore_clear_queue) {
-        if (wait) {
-
-            // If a clear is queued, clear before adding another to the queue.
-            if (this.clear_queued) {
-                this.clear_output(false);
-            }
-
-            this.clear_queued = true;
-        } else {
-
-            // Fix the output div's height if the clear_output is waiting for
-            // new output (it is being used in an animation).
-            if (!ignore_clear_queue && this.clear_queued) {
-                // this.element.height() rounds the height, so we get the exact value
-                var height = this.element[0].getBoundingClientRect().height;
-                this.element.height(height);
-                this.clear_queued = false;
-            }
-
-            // Clear all
-            // Remove load event handlers from img tags because we don't want
-            // them to fire if the image is never added to the page.
-            this.element.find('img').off('load');
-            this.element.trigger('clearing', {output_area: this});
-            this.element.html("");
-
-            // Notify others of changes.
-            this.element.trigger('changed', {output_area: this});
-            this.element.trigger('cleared', {output_area: this});
-
-            this.outputs = [];
-            this._display_id_targets = {};
-            this.trusted = true;
-            this.unscroll_area();
-            this.expand();
-            return;
-        }
-    };
-
-
-    // JSON serialization
-
-    OutputArea.prototype.fromJSON = function (outputs, metadata) {
-        var len = outputs.length;
-        metadata = metadata || {};
-
-        for (var i=0; i<len; i++) {
-            this.append_output(outputs[i]);
-        }
-        if (metadata.collapsed !== undefined) {
-            if (metadata.collapsed) {
-                this.collapse();
-            } else {
-                this.expand();
-            }
-        }
-        if (metadata.scrolled !== undefined) {
-            this.scroll_state = metadata.scrolled;
-            if (metadata.scrolled) {
-                this.scroll_if_long();
-            } else {
-                this.unscroll_area();
-            }
-        }
-    };
-
-    /**
-     * Return for-saving version of outputs.
-     * Excludes transient values.
-     */
-    OutputArea.prototype.toJSON = function () {
-        return this.outputs.map(function (out) {
-            var out2 = {};
-            Object.keys(out).map(function (key) {
-                if (key != 'transient') {
-                    out2[key] = out[key];
-                }
-            });
-            return out2;
-        });
-    };
-
-    /**
-     * Class properties
-     **/
-
-    /**
-     * Threshold to trigger autoscroll when the OutputArea is resized,
-     * typically when new outputs are added.
-     *
-     * Behavior is undefined if autoscroll is lower than minimum_scroll_threshold,
-     * unless it is < 0, in which case autoscroll will never be triggered
-     *
-     * @property auto_scroll_threshold
-     * @type Number
-     * @default 100
-     *
-     **/
-    OutputArea.auto_scroll_threshold = 100;
-
-    /**
-     * Lower limit (in lines) for OutputArea to be made scrollable. OutputAreas
-     * shorter than this are never scrolled.
-     *
-     * @property minimum_scroll_threshold
-     * @type Number
-     * @default 20
-     *
-     **/
-    OutputArea.minimum_scroll_threshold = 20;
-
-
-    OutputArea.display_order = [
-        MIME_JAVASCRIPT,
-        MIME_HTML,
-        MIME_MARKDOWN,
-        MIME_LATEX,
-        MIME_SVG,
-        MIME_PNG,
-        MIME_JPEG,
-        MIME_GIF,
-        MIME_PDF,
-        MIME_TEXT
-    ];
-
-    OutputArea.append_map = {};
-    OutputArea.append_map[MIME_TEXT] = append_text;
-    OutputArea.append_map[MIME_HTML] = append_html;
-    OutputArea.append_map[MIME_MARKDOWN] = append_markdown;
-    OutputArea.append_map[MIME_SVG] = append_svg;
-    OutputArea.append_map[MIME_PNG] = append_png;
-    OutputArea.append_map[MIME_JPEG] = append_jpeg;
-    OutputArea.append_map[MIME_GIF] = append_gif;
-    OutputArea.append_map[MIME_LATEX] = append_latex;
-    OutputArea.append_map[MIME_JAVASCRIPT] = append_javascript;
-    OutputArea.append_map[MIME_PDF] = append_pdf;
-
-    OutputArea.prototype.mime_types = function () {
-        return OutputArea.display_order;
-    };
-
-    OutputArea.prototype.register_mime_type = function (mimetype, append, options) {
-        if (mimetype && typeof(append) === 'function') {
-            OutputArea.output_types.push(mimetype);
-            if (options.safe) OutputArea.safe_outputs[mimetype] = true;
-            OutputArea.display_order.splice(options.index || 0, 0, mimetype);
-            OutputArea.append_map[mimetype] = append;
-        }
-    };
-
-    return {'OutputArea': OutputArea};
-});
diff --git a/notebook/static/notebook/js/pager.js b/notebook/static/notebook/js/pager.js
deleted file mode 100644
index 488c88752..000000000
--- a/notebook/static/notebook/js/pager.js
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n',
-    'jquery-ui'
-], function($, utils, i18n) {
-    "use strict";
-
-    var Pager = function (pager_selector, options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  pager_selector: string
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance
-         */
-        this.events = options.events;
-        this.pager_element = $(pager_selector);
-        this.pager_button_area = $('#pager-button-area');
-        this._default_end_space = 100;
-        this.pager_element.resizable({handles: 'n', resize: $.proxy(this._resize, this)});
-        this.expanded = false;
-        this.create_button_area();
-        this.bind_events();
-    };
-
-    Pager.prototype.create_button_area = function(){
-        var that = this;
-        this.pager_button_area.append(
-            $('<a>').attr('role', "button")
-                    .attr('title',i18n.msg._("Open the pager in an external window"))
-                    .addClass('ui-button')
-                    .click(function(){that.detach();})
-                    .append(
-                        $('<span>').addClass("ui-icon ui-icon-extlink")
-                    )
-        );
-        this.pager_button_area.append(
-            $('<a>').attr('role', "button")
-                    .attr('title',i18n.msg._("Close the pager"))
-                    .addClass('ui-button')
-                    .click(function(){that.collapse();})
-                    .append(
-                        $('<span>').addClass("ui-icon ui-icon-close")
-                    )
-        );
-    };
-
-
-    Pager.prototype.bind_events = function () {
-        var that = this;
-
-        this.pager_element.bind('collapse_pager', function (event, extrap) {
-            // Animate hiding of the pager.
-            var time = (extrap && extrap.duration) ? extrap.duration : 'fast';
-            that.pager_element.animate({
-                height: 'toggle'
-            }, {
-                duration: time,
-                done: function() {
-                    $('.end_space').css('height', that._default_end_space);
-                }
-            });
-        });
-
-        this.pager_element.bind('expand_pager', function (event, extrap) {
-            // Clear the pager's height attr if it's set.  This allows the
-            // pager to size itself according to its contents.
-            that.pager_element.height('initial');
-
-            // Animate the showing of the pager
-            var time = (extrap && extrap.duration) ? extrap.duration : 'fast';
-            that.pager_element.show(time, function() {
-                // Explicitly set pager height once the pager has shown itself.
-                // This allows the pager-contents div to use percentage sizing.
-                that.pager_element.height(that.pager_element.height());
-                that._resize();
-                
-                // HACK: Less horrible, but still horrible hack to force the
-                // pager to show it's scrollbars on FireFox. ipython/ipython/#8853
-                that.pager_element.css('position', 'relative');
-                window.requestAnimationFrame(function() { /* Wait one frame */                    
-                    that.pager_element.css('position', '');
-                });
-            });
-        });
-
-        this.events.on('open_with_text.Pager', function (event, payload) {
-            // FIXME: support other mime types with generic mimebundle display
-            // mechanism
-            if (payload.data['text/html'] && payload.data['text/html'] !== "") {
-                that.clear();
-                that.expand();
-                that.append(payload.data['text/html']);
-            } else if (payload.data['text/plain'] && payload.data['text/plain'] !== "") {
-                that.clear();
-                that.expand();
-                that.append_text(payload.data['text/plain']);
-            }
-        });
-    };
-
-
-    Pager.prototype.collapse = function (extrap) {
-        if (this.expanded === true) {
-            this.expanded = false;
-            this.pager_element.trigger('collapse_pager', extrap);
-        }
-    };
-
-
-    Pager.prototype.expand = function (extrap) {
-        if (this.expanded !== true) {
-            this.expanded = true;
-            this.pager_element.trigger('expand_pager', extrap);
-        }
-    };
-
-
-    Pager.prototype.toggle = function () {
-        if (this.expanded === true) {
-            this.collapse();
-        } else {
-            this.expand();
-        }
-    };
-
-
-    Pager.prototype.clear = function (text) {
-        this.pager_element.find(".container").empty();
-    };
-
-    Pager.prototype.detach = function(){
-        var w = window.open("","_blank");
-        $(w.document.head)
-        .append(
-                $('<link>')
-                .attr('rel',"stylesheet")
-                .attr('href', utils.url_path_join(utils.get_body_data('baseUrl'), "static/style/style.min.css"))
-                .attr('type',"text/css")
-        )
-        .append(
-                $('<title>').text(i18n.msg._("Jupyter Pager"))
-        );
-        var pager_body = $(w.document.body);
-        pager_body.css('overflow','scroll');
-
-        pager_body.append(this.pager_element.clone().children());
-        w.document.close();
-        this.collapse();
-    };
-
-    Pager.prototype.append_text = function (text) {
-        /**
-         * The only user content injected with this HTML call is escaped by
-         * the fixConsole() method.
-         */
-        this.pager_element.find(".container").append($('<pre/>').html(utils.fixConsole(utils.fixOverwrittenChars(text))));
-    };
-
-    Pager.prototype.append = function (htm) {
-        /**
-         * The only user content injected with this HTML call is escaped by
-         * the fixConsole() method.
-         */
-        this.pager_element.find(".container").append(htm);
-    };
-
-
-    Pager.prototype._resize = function() {
-        /**
-         * Update document based on pager size.
-         */
-        
-        // Make sure the padding at the end of the notebook is large
-        // enough that the user can scroll to the bottom of the 
-        // notebook.
-        $('.end_space').css('height', Math.max(this.pager_element.height(), this._default_end_space));
-    };
-
-    return {'Pager': Pager};
-});
diff --git a/notebook/static/notebook/js/promises.js b/notebook/static/notebook/js/promises.js
deleted file mode 100644
index 9d7ce1df7..000000000
--- a/notebook/static/notebook/js/promises.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-// Define promises for notebook events.
-
-define(['base/js/events', 'base/js/promises'], function(events, promises) {
-    "use strict";
-
-    // Promise to be resolved when the notebook is *initially* loaded.
-    // The event may fire again if the notebook is reloaded later, but this
-    // promise only tracks the initial load.
-    promises.notebook_loaded = new Promise(function(resolve, reject) {
-        events.one('notebook_loaded.Notebook', function() {
-            resolve();
-        });
-        events.one('notebook_load_failed.Notebook', function() {
-            reject();
-        });
-    });
-
-    return promises;
-});
diff --git a/notebook/static/notebook/js/quickhelp.js b/notebook/static/notebook/js/quickhelp.js
deleted file mode 100644
index 98693e179..000000000
--- a/notebook/static/notebook/js/quickhelp.js
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/dialog',
-    'underscore'
-], function($, utils, i18n, dialog, _) {
-    "use strict";
-
-    var platform = utils.platform;
-
-    var QuickHelp = function (options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance
-         *          keyboard_manager: KeyboardManager instance
-         *          notebook: Notebook instance
-         */
-        this.keyboard_manager = options.keyboard_manager;
-        this.notebook = options.notebook;
-        this.keyboard_manager.quick_help = this;
-        this.events = options.events;
-    };
-
-    var cmd_ctrl = 'Ctrl-';
-    var platform_specific;
-
-    if (platform === 'MacOS') {
-        // Mac OS X specific
-        cmd_ctrl = 'Cmd-';
-        platform_specific = [
-            { shortcut: "Cmd-Up", help:i18n.msg._("go to cell start") },
-            { shortcut: "Cmd-Down", help:i18n.msg._("go to cell end") },
-            { shortcut: "Alt-Left", help:i18n.msg._("go one word left") },
-            { shortcut: "Alt-Right", help:i18n.msg._("go one word right") },
-            { shortcut: "Alt-Backspace", help:i18n.msg._("delete word before") },
-            { shortcut: "Alt-Delete", help:i18n.msg._("delete word after") },
-            { shortcut: "Cmd-Shift-z", help:i18n.msg._("redo") },
-            { shortcut: "Cmd-Shift-u", help:i18n.msg._("redo selection") },
-            { shortcut: "Ctrl-k", help:i18n.msg._("emacs-style line kill") },
-            { shortcut: "Cmd-Backspace", help:i18n.msg._("delete line left of cursor") },
-            { shortcut: "Cmd-Delete", help:i18n.msg._("delete line right of cursor") }
-        ];
-    } else {
-        // PC specific
-        platform_specific = [
-            { shortcut: "Ctrl-Home", help:i18n.msg._("go to cell start") },
-            { shortcut: "Ctrl-Up", help:i18n.msg._("go to cell start") },
-            { shortcut: "Ctrl-End", help:i18n.msg._("go to cell end") },
-            { shortcut: "Ctrl-Down", help:i18n.msg._("go to cell end") },
-            { shortcut: "Ctrl-Left", help:i18n.msg._("go one word left") },
-            { shortcut: "Ctrl-Right", help:i18n.msg._("go one word right") },
-            { shortcut: "Ctrl-Backspace", help:i18n.msg._("delete word before")},
-            { shortcut: "Ctrl-Delete", help:i18n.msg._("delete word after")},
-            { shortcut: "Ctrl-y", help:i18n.msg._("redo")},
-            { shortcut: "Alt-u", help:i18n.msg._("redo selection") }
-        ];
-    }
-
-    var cm_shortcuts = [
-        { shortcut:"Tab", help:i18n.msg._("code completion or indent") },
-        { shortcut:"Shift-Tab", help:i18n.msg._("tooltip") },
-        { shortcut: cmd_ctrl + "]", help:i18n.msg._("indent") },
-        { shortcut: cmd_ctrl + "[", help:i18n.msg._("dedent") },
-        { shortcut: cmd_ctrl + "a", help:i18n.msg._("select all") },
-        { shortcut: cmd_ctrl + "z", help:i18n.msg._("undo") },
-        { shortcut: cmd_ctrl + "/", help:i18n.msg._("comment") },
-        { shortcut: cmd_ctrl + "d", help:i18n.msg._("delete whole line") },
-        { shortcut: cmd_ctrl + "u", help:i18n.msg._("undo selection") },
-        { shortcut: "Insert", help:i18n.msg._("toggle overwrite flag") }
-    ].concat( platform_specific );
-    
-    var mac_humanize_map = {
-        // all these are unicode, will probably display badly on anything except macs.
-        // these are the standard symbol that are used in MacOS native menus
-        // cf https://apple.stackexchange.com/questions/55727/
-        // for htmlentities and/or unicode value
-        'cmd':'⌘',
-        'shift':'⇧',
-        'alt':'⌥',
-        'up':'↑',
-        'down':'↓',
-        'left':'←',
-        'right':'→',
-        'eject':'⏏',
-        'tab':'⇥',
-        'backtab':'⇤',
-        'capslock':'⇪',
-        'esc':'esc',
-        'ctrl':'⌃',
-        'enter':'↩',
-        'pageup':'⇞',
-        'pagedown':'⇟',
-        'home':'↖',
-        'end':'↘',
-        'altenter':'⌤',
-        'space':'␣',
-        'delete':'⌦',
-        'backspace':'⌫',
-        'apple':'',
-    };
-
-    var default_humanize_map = {
-        'shift':i18n.msg._('Shift'),
-        'alt':i18n.msg._('Alt'),
-        'up':i18n.msg._('Up'),
-        'down':i18n.msg._('Down'),
-        'left':i18n.msg._('Left'),
-        'right':i18n.msg._('Right'),
-        'tab':i18n.msg._('Tab'),
-        'capslock':i18n.msg._('Caps Lock'),
-        'esc':i18n.msg._('Esc'),
-        'ctrl':i18n.msg._('Ctrl'),
-        'enter':i18n.msg._('Enter'),
-        'pageup':i18n.msg._('Page Up'),
-        'pagedown':i18n.msg._('Page Down'),
-        'home':i18n.msg._('Home'),
-        'end':i18n.msg._('End'),
-        'space':i18n.msg._('Space'),
-        'backspace':i18n.msg._('Backspace'),
-        '-':i18n.msg._('Minus')
-        };
-    
-    var humanize_map;
-
-    if (platform === 'MacOS'){
-        humanize_map = mac_humanize_map;
-    } else {
-        humanize_map = default_humanize_map;
-    }
-
-    var special_case = { pageup: i18n.msg._("PageUp"), pagedown: i18n.msg._("Page Down") };
-    
-    function humanize_key(key){
-        if (key.length === 1){
-            return key.toUpperCase();
-        }
-
-        key = humanize_map[key.toLowerCase()]||key;
-        
-        if (key.indexOf(',') === -1){
-            return  ( special_case[key] ? special_case[key] : key.charAt(0).toUpperCase() + key.slice(1) );
-        }
-    }
-
-    // return an **html** string of the keyboard shortcut
-    // for human eyes consumption.
-    // the sequence is a string, comma separated linkt of shortcut,
-    // where the shortcut is a list of dash-joined keys.
-    // Each shortcut will be wrapped in <kbd> tag, and joined by comma is in a
-    // sequence.
-    //
-    // Depending on the platform each shortcut will be normalized, with or without dashes.
-    // and replace with the corresponding unicode symbol for modifier if necessary.
-    function humanize_sequence(sequence){
-        var joinchar = ',';
-        var hum = _.map(sequence.replace(/meta/g, 'cmd').split(','), humanize_shortcut).join(joinchar);
-        return hum;
-    }
-
-    function _humanize_sequence(sequence){
-        var joinchar = ',';
-        var hum = _.map(sequence.replace(/meta/g, 'cmd').split(','), _humanize_shortcut).join(joinchar);
-        return hum;
-    }
-
-    function _humanize_shortcut(shortcut){
-        var joinchar = '-';
-        if (platform === 'MacOS'){
-            joinchar = '';
-        }
-        return _.map(shortcut.split('-'), humanize_key ).join(joinchar);
-    }
-
-    function humanize_shortcut(shortcut){
-        return '<kbd>'+_humanize_shortcut(shortcut)+'</kbd>';
-    }
-    
-
-    QuickHelp.prototype.show_keyboard_shortcuts = function () {
-        /**
-         * toggles display of keyboard shortcut dialog
-         */
-        var that = this;
-        if ( this.force_rebuild ) {
-            this.shortcut_dialog.remove();
-            delete(this.shortcut_dialog);
-            this.force_rebuild = false;
-        }
-        if ( this.shortcut_dialog ){
-            // if dialog is already shown, close it
-            $(this.shortcut_dialog).modal("toggle");
-            return;
-        }
-        var element = $('<div/>');
-
-        // The documentation
-        var doc = $('<div/>').addClass('alert alert-info');
-        doc.append(i18n.msg._('The Jupyter Notebook has two different keyboard input modes.'))
-           .append(' ')
-           .append(i18n.msg._('<b>Edit mode</b> allows you to type code or text into a cell and is indicated by a green cell border.'))
-           .append(' ')
-           .append(i18n.msg._('<b>Command mode</b> binds the keyboard to notebook level commands and is indicated by a grey cell border with a blue left margin.')
-        );
-        element.append(doc);
-        if (platform === 'MacOS') {
-            doc = $('<div/>').addClass('alert alert-info');
-            var key_div = this.build_key_names();
-            doc.append(key_div);
-            element.append(doc);
-        }
-
-        // Command mode
-        var cmd_div = this.build_command_help();
-        element.append(cmd_div);
-
-        // Edit mode
-        var edit_div = this.build_edit_help(cm_shortcuts);
-        element.append(edit_div);
-
-        // This statement is used simply so that message extraction
-        // will pick up the strings.  The actual setting of the text
-        // for the button is in dialog.js.
-        var button_labels = [ i18n.msg._("Close") ];
-
-        this.shortcut_dialog = dialog.modal({
-            title : i18n.msg._("Keyboard shortcuts"),
-            body : element,
-            destroy : false,
-            buttons : {
-                Close : {}
-            },
-            notebook: this.notebook,
-            keyboard_manager: this.keyboard_manager,
-        });
-        this.shortcut_dialog.addClass("modal_stretch");
-        
-        this.events.on('rebuild.QuickHelp', function() { that.force_rebuild = true;});
-    };
-
-    QuickHelp.prototype.build_key_names = function () {
-       var key_names_mac =  [{ shortcut:"⌘", help:i18n.msg._("Command") },
-                    { shortcut:"⌃", help:i18n.msg._("Control") },
-                    { shortcut:"⌥", help:i18n.msg._("Option") },
-                    { shortcut:"⇧", help:i18n.msg._("Shift") },
-                    { shortcut:"↩", help:i18n.msg._("Return") },
-                    { shortcut:"␣", help:i18n.msg._("Space") },
-                    { shortcut:"⇥", help:i18n.msg._("Tab") }];
-        var i, half, n;
-        var div = $('<div/>').append('Mac OS X modifier keys:');
-        var sub_div = $('<div/>').addClass('container-fluid');
-        var col1 = $('<div/>').addClass('col-md-6');
-        var col2 = $('<div/>').addClass('col-md-6');
-        n = key_names_mac.length;
-        half = ~~(n/2);
-        for (i=0; i<half; i++) { col1.append(
-                build_one(key_names_mac[i])
-                ); }
-        for (i=half; i<n; i++) { col2.append(
-                build_one(key_names_mac[i])
-                ); }
-        sub_div.append(col1).append(col2);
-        div.append(sub_div);
-        return div;
-    };
-
-
-    QuickHelp.prototype.build_command_help = function () {
-        var that = this;
-        var command_shortcuts = this.keyboard_manager.command_shortcuts.help();
-        var cmdkey = '<kbd>'+i18n.msg._('Esc')+'</kbd>';
-        var div = build_div('<h4>'+i18n.msg.sprintf(i18n.msg._('Command Mode (press %s to enable)'),cmdkey)+'</h4>', command_shortcuts);
-        var edit_button = $('<button/>')
-            .text(i18n.msg._("Edit Shortcuts"))
-            .addClass('btn btn-xs btn-default pull-right')
-            .attr('href', '#')
-            .attr('title', i18n.msg._('edit command-mode keyboard shortcuts'))
-            .click(function () {
-                // close this dialog
-                $(that.shortcut_dialog).modal("toggle");
-                // and open the next one
-                $(that.shortcut_dialog).on('hidden.bs.modal', function (e) {
-                    that.keyboard_manager.actions.call(
-                        'jupyter-notebook:edit-command-mode-keyboard-shortcuts'
-                    );
-                });
-            });
-        div.find('h4').append(edit_button);
-        return div;
-    };
-
-    
-    QuickHelp.prototype.build_edit_help = function (cm_shortcuts) {
-        var edit_shortcuts = this.keyboard_manager.edit_shortcuts.help();
-        var enterkey = '<kbd>'+i18n.msg._('Enter')+'</kbd>';
-        edit_shortcuts = $.merge($.merge([], cm_shortcuts), edit_shortcuts);
-        return build_div('<h4>'+i18n.msg.sprintf(i18n.msg._('Edit Mode (press %s to enable)'),enterkey)+'</h4>', edit_shortcuts);
-    };
-
-    var build_one = function (s) {
-        var help = s.help;
-        var shortcut = '';
-        if(s.shortcut){
-            shortcut = humanize_sequence(s.shortcut);
-        }
-        return $('<div>').addClass('quickhelp').
-            append($('<span/>').addClass('shortcut_key').append($(shortcut))).
-            append($('<span/>').addClass('shortcut_descr').text(' : ' + help));
-
-    };
-
-    var build_div = function (title, shortcuts) {
-        
-        // Remove jupyter-notebook:ignore shortcuts.
-        shortcuts = shortcuts.filter(function(shortcut) {
-            if (shortcut.help === 'ignore') {
-                return false;
-            } else {
-                return true;
-            }
-        });
-        
-        var i, half, n;
-        var div = $('<div/>').append($(title));
-        var sub_div = $('<div/>').addClass('container-fluid');
-        var col1 = $('<div/>').addClass('col-md-6');
-        var col2 = $('<div/>').addClass('col-md-6');
-        n = shortcuts.length;
-        half = ~~(n/2);  // Truncate :)
-        for (i=0; i<half; i++) { col1.append( build_one(shortcuts[i]) ); }
-        for (i=half; i<n; i++) { col2.append( build_one(shortcuts[i]) ); }
-        sub_div.append(col1).append(col2);
-        div.append(sub_div);
-        return div;
-    };
-
-    return {'QuickHelp': QuickHelp,
-      humanize_shortcut: humanize_shortcut,
-      humanize_sequence: humanize_sequence,
-      _humanize_sequence: _humanize_sequence,
-  };
-});
diff --git a/notebook/static/notebook/js/savewidget.js b/notebook/static/notebook/js/savewidget.js
deleted file mode 100644
index 3a8615716..000000000
--- a/notebook/static/notebook/js/savewidget.js
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/dialog',
-    'base/js/keyboard',
-    'moment',
-    'bidi/bidi',
-], function($, utils, i18n, dialog, keyboard, moment, bidi) {
-    "use strict";
-
-    var SaveWidget = function (selector, options) {
-        /**
-         * TODO: Remove circular ref.
-         */
-        this.notebook = undefined;
-        this.selector = selector;
-        this.events = options.events;
-        this._checkpoint_date = undefined;
-        this.keyboard_manager = options.keyboard_manager;
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.bind_events();
-        }
-    };
-
-
-    SaveWidget.prototype.bind_events = function () {
-        var that = this;
-        this.element.find('span.filename').click(function () {
-            that.rename_notebook({notebook: that.notebook});
-        });
-        this.events.on('notebook_loaded.Notebook', function () {
-            that.update_notebook_name();
-            that.update_document_title();
-        });
-        this.events.on('notebook_saved.Notebook', function () {
-            that.update_notebook_name();
-            that.update_document_title();
-        });
-        this.events.on('notebook_renamed.Notebook', function () {
-            that.update_notebook_name();
-            that.update_document_title();
-            that.update_address_bar();
-        });
-        this.events.on('notebook_save_failed.Notebook', function () {
-            that.set_save_status(i18n.msg._('Autosave Failed!'));
-        });
-        this.events.on('notebook_read_only.Notebook', function () {
-            that.set_save_status('(read only)');
-            // disable future set_save_status
-            that.set_save_status = function () {};
-        });
-        this.events.on('checkpoints_listed.Notebook', function (event, data) {
-            that._set_last_checkpoint(data[0]);
-        });
-
-        this.events.on('checkpoint_created.Notebook', function (event, data) {
-            that._set_last_checkpoint(data);
-        });
-        this.events.on('set_dirty.Notebook', function (event, data) {
-            that.set_autosaved(data.value);
-        });
-    };
-
-    // This statement is used simply so that message extraction
-    // will pick up the strings.  The actual setting of the text
-    // for the button is in dialog.js.
-    var button_labels = [ i18n.msg._("Cancel"), i18n.msg._("Rename"), i18n.msg._("OK")];
-
-    SaveWidget.prototype.rename_notebook = function (options) {
-        options = options || {};
-        var that = this;
-        var dialog_body = $('<div/>').append(
-            $("<p/>").addClass("rename-message")
-                .text(i18n.msg._('Enter a new notebook name:'))
-        ).append(
-            $("<br/>")
-        ).append(
-            $('<input/>').attr('type','text').attr('size','25').addClass('form-control')
-            .val(options.notebook.get_notebook_name())
-        );
-        var d = dialog.modal({
-            title: i18n.msg._("Rename Notebook"),
-            body: dialog_body,
-            notebook: options.notebook,
-            keyboard_manager: this.keyboard_manager,
-            default_button: "Cancel",
-            buttons : {
-                "Cancel": {},
-                "Rename": {
-                    class: "btn-primary",
-                    click: function () {
-                        var new_name = d.find('input').val();
-                        if (!options.notebook.test_notebook_name(new_name)) {
-                            d.find('.rename-message').text(i18n.msg._(
-                                "Invalid notebook name. Notebook names must have 1 or more characters and can contain any characters except :/\\. Please enter a new notebook name:")
-                            );
-                            return false;
-                        } else {
-                            d.find('.rename-message').text(i18n.msg._("Renaming..."));
-                            d.find('input[type="text"]').prop('disabled', true);
-                            that.notebook.rename(new_name).then(
-                                function () {
-                                    d.modal('hide');
-                                }, function (error) {
-                                    d.find('.rename-message').text(error.message || i18n.msg._('Unknown error'));
-                                    d.find('input[type="text"]').prop('disabled', false).focus().select();
-                                }
-                            );
-                            return false;
-                        }
-                    }
-                }
-            },
-            open : function () {
-                /**
-                 * Upon ENTER, click the OK button.
-                 */
-                d.find('input[type="text"]').keydown(function (event) {
-                    if (event.which === keyboard.keycodes.enter) {
-                        d.find('.btn-primary').first().click();
-                        return false;
-                    }
-                });
-                d.find('input[type="text"]').focus().select();
-            }
-        });
-    };
-
-
-    SaveWidget.prototype.update_notebook_name = function () {
-        var nbname = this.notebook.get_notebook_name();
-        nbname = bidi.applyBidi(nbname);
-        this.element.find('span.filename').text(nbname);
-    };
-
-
-    SaveWidget.prototype.update_document_title = function () {
-        var nbname = this.notebook.get_notebook_name();
-        document.title = nbname + ' - Jupyter Notebook';
-    };
-
-    SaveWidget.prototype.update_address_bar = function(){
-        var base_url = this.notebook.base_url;
-        var path = this.notebook.notebook_path;
-        var state = {path : path};
-        window.history.replaceState(state, "", utils.url_path_join(
-            base_url,
-            "notebooks",
-            utils.encode_uri_components(path))
-        );
-    };
-
-
-    SaveWidget.prototype.set_save_status = function (msg) {
-        this.element.find('span.autosave_status').text(msg);
-    };
-
-    SaveWidget.prototype._set_last_checkpoint = function (checkpoint) {
-        if (checkpoint) {
-            this._checkpoint_date = new Date(checkpoint.last_modified);
-        } else {
-            this._checkpoint_date = null;
-        }
-        this._render_checkpoint();
-    };
-    
-    SaveWidget.prototype._render_checkpoint = function () {
-        /** actually set the text in the element, from our _checkpoint value
-        
-        called directly, and periodically in timeouts.
-        */
-        this._schedule_render_checkpoint();
-        var el = this.element.find('span.checkpoint_status');
-        if (!this._checkpoint_date) {
-            el.text('').attr('title', i18n.msg._('no checkpoint'));
-            return;
-        }
-        var chkd = moment(this._checkpoint_date);
-        var long_date = chkd.format('llll');
-        var human_date;
-        var tdelta = Math.ceil(new Date() - this._checkpoint_date);
-        if (tdelta < utils.time.milliseconds.d){
-            // less than 24 hours old, use relative date
-            human_date = chkd.fromNow();
-        } else {
-            // otherwise show calendar
-            // <Today | yesterday|...> at hh,mm,ss
-            human_date = chkd.calendar();
-        }
-        
-        el.text(i18n.msg.sprintf(i18n.msg._('Last Checkpoint: %s'),human_date)).attr('title', long_date);
-    };
-
-    
-    SaveWidget.prototype._schedule_render_checkpoint = function () {
-        /** schedule the next update to relative date
-        
-        periodically updated, so short values like 'a few seconds ago' don't get stale.
-        */
-        if (!this._checkpoint_date) {
-            return;
-        }
-        if ((this._checkpoint_timeout)) {
-            clearTimeout(this._checkpoint_timeout);
-        }
-        var dt = Math.ceil(new Date() - this._checkpoint_date);
-        this._checkpoint_timeout = setTimeout(
-            $.proxy(this._render_checkpoint, this),
-            utils.time.timeout_from_dt(dt)
-        );
-    };
-
-    SaveWidget.prototype.set_autosaved = function (dirty) {
-        if (dirty) {
-            this.set_save_status(i18n.msg._("(unsaved changes)"));
-        } else {
-            this.set_save_status(i18n.msg._("(autosaved)"));
-        }
-    };
-
-    return {'SaveWidget': SaveWidget};
-
-});
diff --git a/notebook/static/notebook/js/scrollmanager.js b/notebook/static/notebook/js/scrollmanager.js
deleted file mode 100644
index 48d2174e5..000000000
--- a/notebook/static/notebook/js/scrollmanager.js
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-define(['jquery'], function($) {
-    "use strict";
-
-    var ScrollManager = function(notebook, options) {
-        /**
-         * Public constructor.
-         */
-        this.notebook = notebook;
-        this.element = $('#site');
-        options = options || {};
-        this.animation_speed = options.animation_speed || 250; //ms
-    };
-
-    ScrollManager.prototype.onScroll = function (func, rate) {
-        /**
-         * Register a function to be called when the page is scrolled, throttled
-         * at a particular rate limit.
-         */
-         rate = rate || 100; // default rate limit
-         this.element.scroll(function () {
-             clearTimeout(func._timeout);
-             func._timeout = setTimeout(func, rate);
-         });
-    };
-
-    ScrollManager.prototype.scroll = function (delta) {
-        /**
-         * Scroll the document.
-         *
-         * Parameters
-         * ----------
-         * delta: integer
-         *  direction to scroll the document.  Positive is downwards. 
-         *  Unit is one page length.
-         */
-        this.scroll_some(delta);
-        return false;
-    };
-
-    ScrollManager.prototype.scroll_to = function(selector) {
-        /**
-         * Scroll to an element in the notebook.
-         */
-        this.element.animate({'scrollTop': $(selector).offset().top + this.element.scrollTop() - this.element.offset().top}, this.animation_speed);
-    };
-
-    ScrollManager.prototype.scroll_some = function(pages) {
-        /**
-         * Scroll up or down a given number of pages.
-         *
-         * Parameters
-         * ----------
-         * pages: integer
-         *  number of pages to scroll the document, may be positive or negative.
-         */
-        this.element.animate({'scrollTop': this.element.scrollTop() + pages * this.element.height()}, this.animation_speed);
-    };
-
-    ScrollManager.prototype.get_first_visible_cell = function() {
-        /**
-         * Gets the index of the first visible cell in the document.
-         *
-         * First, attempt to be smart by guessing the index of the cell we are
-         * scrolled to.  Then, walk from there up or down until the right cell 
-         * is found.  To guess the index, get the top of the last cell, and
-         * divide that by the number of cells to get an average cell height.  
-         * Then divide the scroll height by the average cell height.
-         */
-        var cell_count = this.notebook.ncells();
-        var first_cell_top = this.notebook.get_cell(0).element.offset().top;
-        var last_cell_top = this.notebook.get_cell(cell_count-1).element.offset().top;
-        var avg_cell_height = (last_cell_top - first_cell_top) / cell_count;
-        var i = Math.ceil(this.element.scrollTop() / avg_cell_height);
-        i = Math.min(Math.max(i , 0), cell_count - 1);
-
-        while (this.notebook.get_cell(i).element.offset().top - first_cell_top < this.element.scrollTop() && i < cell_count - 1) {
-            i += 1;
-        } 
-
-        while (this.notebook.get_cell(i).element.offset().top - first_cell_top > this.element.scrollTop() - 50 && i >= 0) {
-            i -= 1;
-        } 
-        return Math.min(i + 1, cell_count - 1);
-    };
-
-    ScrollManager.prototype.is_cell_visible = function (cell) {
-        var cell_rect = cell.element[0].getBoundingClientRect();
-        var scroll_rect = this.element[0].getBoundingClientRect();
-        return ((cell_rect.top <= scroll_rect.bottom) && (cell_rect.bottom >= scroll_rect.top));
-    };
-
-
-    var TargetScrollManager = function(notebook, options) {
-        /**
-         * Public constructor.
-         */
-        ScrollManager.apply(this, [notebook, options]);
-    };
-    TargetScrollManager.prototype = Object.create(ScrollManager.prototype);
-
-    TargetScrollManager.prototype.is_target = function (index) {
-        /**
-         * Check if a cell should be a scroll stop.
-         *
-         * Returns `true` if the cell is a cell that the scroll manager
-         * should scroll to.  Otherwise, false is returned. 
-         *
-         * Parameters
-         * ----------
-         * index: integer
-         *  index of the cell to test.
-         */
-        return false;
-    };
-
-    TargetScrollManager.prototype.scroll = function (delta) {
-        /**
-         * Scroll the document.
-         *
-         * Parameters
-         * ----------
-         * delta: integer
-         *  direction to scroll the document.  Positive is downwards.
-         *  Units are targets.
-         *
-         * Try to scroll to the next slide.
-         */
-        var cell_count = this.notebook.ncells();
-        var selected_index = this.get_first_visible_cell() + delta;
-        while (0 <= selected_index && selected_index < cell_count && !this.is_target(selected_index)) {
-            selected_index += delta;
-        }
-
-        if (selected_index < 0 || cell_count <= selected_index) {
-            return ScrollManager.prototype.scroll.apply(this, [delta]);
-        } else {
-            this.scroll_to(this.notebook.get_cell(selected_index).element);
-            
-            // Cancel browser keyboard scroll.
-            return false;
-        }
-    };
-
-
-    var SlideScrollManager = function(notebook, options) {
-        /**
-         * Public constructor.
-         */
-        TargetScrollManager.apply(this, [notebook, options]);
-    };
-    SlideScrollManager.prototype = Object.create(TargetScrollManager.prototype);
-
-    SlideScrollManager.prototype.is_target = function (index) {
-        var cell = this.notebook.get_cell(index);
-        return cell.metadata && cell.metadata.slideshow && 
-            cell.metadata.slideshow.slide_type && 
-            (cell.metadata.slideshow.slide_type === "slide" ||
-            cell.metadata.slideshow.slide_type === "subslide");
-    };
-
-
-    var HeadingScrollManager = function(notebook, options) {
-        /**
-         * Public constructor.
-         */
-        ScrollManager.apply(this, [notebook, options]);
-        options = options || {};
-        this._level = options.heading_level || 1;
-    };
-    HeadingScrollManager.prototype = Object.create(ScrollManager.prototype);
-
-    HeadingScrollManager.prototype.scroll = function (delta) {
-        /**
-         * Scroll the document.
-         *
-         * Parameters
-         * ----------
-         * delta: integer
-         *  direction to scroll the document.  Positive is downwards.
-         *  Units are headers.
-         *
-         * Get all of the header elements that match the heading level or are of
-         * greater magnitude (a smaller header number).
-         */
-        var headers = $();
-        var i;
-        for (i = 1; i <= this._level; i++) {
-            headers = headers.add('#notebook-container h' + i);
-        }
-
-        // Find the header the user is on or below.
-        var first_cell_top = this.notebook.get_cell(0).element.offset().top;
-        var current_scroll = this.element.scrollTop();
-        var header_scroll = 0;
-        i = -1;
-        while (current_scroll >= header_scroll && i < headers.length) {
-            if (++i < headers.length) {
-                header_scroll = $(headers[i]).offset().top - first_cell_top;
-            }
-        }
-        i--;
-
-        // Check if the user is below the header.
-        if (i < 0 || current_scroll > $(headers[i]).offset().top - first_cell_top + 30) {
-            // Below the header, count the header as a target.
-            if (delta < 0) {
-                delta += 1;
-            }
-        }
-        i += delta;
-
-        // Scroll!
-        if (0 <= i && i < headers.length) {
-            this.scroll_to(headers[i]);
-            return false;
-        } else {
-            // Default to the base's scroll behavior when target header doesn't
-            // exist.
-            return ScrollManager.prototype.scroll.apply(this, [delta]);
-        }
-    };
-
-    // Return namespace for require.js loads
-    return {
-        'ScrollManager': ScrollManager,
-        'SlideScrollManager': SlideScrollManager,
-        'HeadingScrollManager': HeadingScrollManager,
-        'TargetScrollManager': TargetScrollManager
-    };
-});
diff --git a/notebook/static/notebook/js/searchandreplace.js b/notebook/static/notebook/js/searchandreplace.js
deleted file mode 100644
index 07a20dc5b..000000000
--- a/notebook/static/notebook/js/searchandreplace.js
+++ /dev/null
@@ -1,401 +0,0 @@
-define([
-    'jquery',
-    'base/js/dialog',
-    'base/js/i18n'
-], function($, dialog, i18n){
-  "use strict";
-
-  /**
-   * escape a Regular expression to act as  a pure search string.
-   * though it will still have the case sensitivity options and all
-   * the benefits
-   **/
-  function escapeRegExp(string){
-    return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  }
-
-  /**
-   * Compute the model of the preview for the search and replace.
-   * It might not be perfectly accurate if matches overlap...
-   * Parameter:
-   *   sre: the string that will become the Search Regular Expression
-   *   arr: a list of string on which the match will be applied.
-   *   isCaseSensitive: should the match be CaseSensitive
-   *   RegExOrNot: a `RegExOrNot` object.
-   *   replace: the replacement string for the matching `sre`
-   * Return: a tuple of 2 value:
-   *   1) array of [before match, match, replacement, after match]
-   *      where before and after match are cut to a reasonable length after the match.
-   *   2) Boolean, whether the matching has been aborted because one of the element of
-   *      arr have too many matches.
-   **/
-  var compute_preview_model = function(sre, arr, isCaseSensitive, RegExpOrNot, replace){
-    var html = [];
-    // and create an array of
-    // before_match, match , replacement, after_match
-    var aborted = false;
-    var replacer_reg = new RegExpOrNot(sre);
-    for(var r=0; r < arr.length; r++){
-      var current_line = arr[r];
-      var match_abort = getMatches(sre, current_line, isCaseSensitive, RegExpOrNot);
-      aborted = aborted || match_abort[1];
-      var matches = match_abort[0];
-      for(var mindex=0; mindex < matches.length ; mindex++){
-        var start = matches[mindex][0];
-        var stop = matches[mindex][1];
-        var initial = current_line.slice(start, stop);
-        var replaced = initial.replace(replacer_reg, replace);
-        // that might be better as a dictionary
-        html.push([cutBefore(current_line.slice(0, start)),
-                   initial,
-                   replaced,
-                   cutAfter(current_line.slice(stop), 30-(stop-start))]);
-      }
-    }
-    return [html, aborted];
-  };
-
-  /**
-   * Build the preview model where things matched and their replacement values
-   * are wrapped in tags with correct CSS classes.
-   * Parameter:
-   *   body: jQuery element into which the preview will be build
-   *   aborted : have the model been aborted (Boolean) use to tell the user
-   *      that the preview might not show all the replacements
-   *   html: array of model created by compute_preview_model
-   *   replace: Boolean: whether we are actually replacing with something or just matching.
-   **/
-  var build_preview = function(body, aborted, html, replace){
-    body.empty();
-    if(aborted){
-      var warnmsg = i18n.msg.sprintf(i18n.msg._("Warning: too many matches (%d). Some changes might not be shown or applied."),html.length);
-      body.append($('<p/>').addClass('bg-warning').text(warnmsg));
-    } else {
-      var matchmsg = i18n.msg.sprintf(i18n.msg.ngettext("%d match","%d matches",html.length),html.length);
-      body.append($('<p/>').text(matchmsg));
-    }
-    for(var rindex=0; rindex<html.length; rindex++){
-      var pre = $('<pre/>')
-        .append(html[rindex][0])
-        .append($('<span/>').addClass('match').text(html[rindex][1]));
-      if(replace){
-        pre.append($('<span/>').addClass('insert').text(html[rindex][2]));
-        pre.addClass('replace');
-      }
-      pre.append(html[rindex][3]);
-      body.append(pre);
-    }
-  };
-
-  /**
-   * Given a string, return only the beginning, with potentially an ellipsis
-   * at the end.
-   **/
-  var cutAfter = function(string, n){
-    n=n||10;
-    while(n<10){
-      n+=15;
-    }
-    if(string.length > n+3){
-        return string.slice(0, n)+'...';
-    }
-    return string;
-  };
-
-  /**
-   * Given a string, return only the end, with potentially an ellipsis
-   * at the beginning.
-   **/
-  var cutBefore = function(string){
-    if(string.length > 33){
-        return '...'+string.slice(-30);
-    }
-    return string;
-  };
-
-  /**
-   * Find all occurrences of `re` in `string`, match in a `caseSensitive`
-   * manner or not, and determine whether `re` is a RegExp or not depending of
-   * the type of object passed as `r`.
-   *
-   * Return a tuple
-   *  1) list of matches [start, stop] indexes in the string.
-   *  2) abort Boolean, if more that 100 matches and the matches were aborted.
-   **/
-  var getMatches = function(re, string, caseSensitive, r){
-    var extra = caseSensitive ? '':'i';
-    extra = '';
-    try {
-      re = r(re, 'g'+extra);// have to global or infinite loop
-    } catch (e){
-      return [[], false];
-    }
-    var res = [];
-    var match;
-    var escape_hatch = 0;
-    var abort = false;
-    while((match = re.exec(string)) !== null) {
-        res.push([match.index, match.index+match[0].length]);
-        escape_hatch++;
-        if(escape_hatch > 100){
-          console.warn(i18n.msg._("More than 100 matches, aborting"));
-          abort = true;
-          break;
-        }
-    }
-    return [res, abort];
-  };
-
-  // main function
-  /**
-   * Search N' Replace action handler.
-   **/
-  var snr = function(env, event) {
-      
-    var isRegExpButton = $('<button/>')
-      .attr('type', 'button')
-      .attr('id', 'isreg')
-      .addClass("btn btn-default btn-sm")
-      .attr('data-toggle','button')
-      .css('font-weight', 'bold')
-      .attr('title', i18n.msg._('Use regex (JavaScript regex syntax)'))
-      .text('.*');
-
-      var allCellsButton = $('<button/>')
-      .append($('<i/>').addClass('fa fa-arrows-v'))
-      .attr('id', 'findreplace_allcells_btn')
-      .attr('type', 'button')
-      .addClass("btn btn-default btn-sm")
-      .attr('data-toggle','button')
-      .attr('title', i18n.msg._('Replace in all cells'));
-
-    var isCaseSensitiveButton = $('<button/>')
-      .attr('type', 'button')
-      .addClass("btn btn-default btn-sm")
-      .attr('data-toggle','button')
-      .attr('tabindex', '0')
-      .attr('title', i18n.msg._('Match case'))
-      .css('font-weight', 'bold')
-      .text('Aa');
-     
-    var search  = $("<input/>")
-      .addClass('form-control input-sm')
-      .attr('id', 'findreplace_find_inp')
-      .attr('placeholder',i18n.msg._('Find'));
-
-    var findFormGroup = $('<div/>').addClass('form-group');
-    findFormGroup.append(
-        $('<div/>').addClass('input-group')
-        .append(
-            $('<div/>').addClass('input-group-btn')
-                .append(isCaseSensitiveButton)
-                .append(isRegExpButton)
-                .append(allCellsButton)
-        )
-        .append(search)
-    )
-
-    var replace = $("<input/>")
-      .attr('id', 'findreplace_replace_inp')
-      .addClass('form-control input-sm')
-      .attr('placeholder',i18n.msg._('Replace'));
-    var replaceFormGroup = $('<div/>').addClass('form-group');
-    replaceFormGroup.append(replace);
-
-    var body = $('<div/>').attr('id', 'replace-preview');
-     
-    var form = $('<form/>').attr('id', 'find-and-replace')
-    form.append(findFormGroup);
-    form.append(replaceFormGroup);
-    form.append(body);
-
-    // return whether the search is case sensitive
-    var isCaseSensitive = function(){
-      var value =  isCaseSensitiveButton.attr('aria-pressed') == 'true';
-      return value;
-    };
-
-    // return whether the search is RegExp based, or
-    // plain string matching.
-    var isReg = function(){
-      var value =  isRegExpButton.attr('aria-pressed') == 'true';
-      return value;
-    };
-
-    var allCells = function(){
-      return (allCellsButton.attr('aria-pressed') == 'true');
-    };
-
-
-    // return a Pseudo RegExp object that acts
-    // either as a plain RegExp Object, or as a pure string matching.
-    // automatically set the flags for case sensitivity from the UI
-    var RegExpOrNot = function(str, flags){
-      if (!isCaseSensitive()){
-        flags = (flags || '')+'i';
-      }
-      if (isRegExpButton.attr('aria-pressed') === 'true'){
-        return new RegExp(str, flags);
-      } else {
-        return new RegExp(escapeRegExp(str), flags);
-      }
-    };
-
-
-    var onError = function(body){
-      body.empty();
-      body.append($('<p/>').text(i18n.msg._('No matches, invalid or empty regular expression')));
-    };
-
-    var get_cells = function(env){
-      if(allCells()){
-        return env.notebook.get_cells();
-      } else {
-        return env.notebook.get_selected_cells();
-      }
-    };
-
-    var get_all_text = function(cells) {
-      var arr = [];
-      for (var c = 0; c < cells.length; c++) {
-        arr = arr.concat(cells[c].code_mirror.getValue().split('\n'));
-      }
-      return arr;
-    };
-    /**
-     * callback triggered anytime a change is made to the
-     * request, case sensitivity, isregex, search or replace
-     * modification.
-     **/
-    var onChange = function(){
-
-      var sre = search.val();
-      // abort on invalid RE
-      if (!sre) {
-        return onError(body);
-      }
-      try {
-        new RegExpOrNot(sre);
-      } catch (e) {
-        return onError(body);
-      }
-
-      // might want to warn if replace is empty
-      var replaceValue = replace.val();
-      var lines = get_all_text(get_cells(env));
-
-      var _hb = compute_preview_model(sre, lines, isCaseSensitive(), RegExpOrNot, replaceValue);
-      var html = _hb[0];
-      var aborted = _hb[1];
-
-      build_preview(body, aborted, html, replaceValue);
-
-      // done on type return false not to submit form
-      return false;
-    };
-
-    var onsubmit = function(event) {
-      var sre = search.val();
-      var replaceValue = replace.val();
-      if (!sre) {
-        return false;
-      }
-      // should abort on invalid RegExp.
-
-      // need to be multi line if we want to directly replace in codemirror.
-      // or need to split/replace/join
-      var reg = RegExpOrNot(sre, 'gm');
-      var cells = get_cells(env);
-      for (var c = 0; c < cells.length; c++) {
-        var cell = cells[c];
-        if (!cell.is_editable()) {
-          continue;
-        }
-          
-        var oldvalue = cell.code_mirror.getValue();
-        var newvalue = oldvalue.replace(reg , replaceValue);
-        cell.code_mirror.setValue(newvalue);
-        if (cell.cell_type === 'markdown') {
-          cell.rendered = false;
-          cell.render();
-        }
-      }
-    };
-
-    // wire-up the UI
-
-    isRegExpButton.click(function(){
-      search.focus();
-      setTimeout(function(){onChange();}, 100);
-    });
-
-    isCaseSensitiveButton.click(function(){
-      search.focus();
-      setTimeout(function(){onChange();}, 100);
-    });
-
-    allCellsButton.click(function(){
-      replace.focus();
-      setTimeout(function(){onChange();}, 100);
-    });
-
-
-    search.keypress(function (e) {
-      if (e.which == 13) {//enter
-        replace.focus();
-      }
-    });
-
-    search.on('input', onChange);
-    replace.on('input',  onChange);
-
-    // This statement is used simply so that message extraction
-    // will pick up the strings.  The actual setting of the text
-    // for the button is in dialog.js.
-    var button_labels = [ i18n.msg._("Replace All")];
-
-    var mod = dialog.modal({
-      show: false,
-      title: i18n.msg._("Find and Replace"),
-      body:form,
-      keyboard_manager: env.notebook.keyboard_manager,
-      buttons:{
-        'Replace All':{ class: "btn-primary",
-            click: function(event){onsubmit(event); return true;},
-            id: "findreplace_replaceall_btn",
-        }
-      },
-      open: function(){
-        search.focus();
-      }
-    });
-
-    replace.keypress(function (e) {
-      if (e.which == 13) {//enter
-        onsubmit();
-        mod.modal('hide');
-      }
-    });
-    mod.modal('show');
-  };
-
-
-  var load = function(keyboard_manager){
-    var action_all = {
-        cmd: i18n.msg._('find and replace'),
-        help: i18n.msg._('find and replace'),
-        handler: function(env, event){
-          snr(env, event);
-        }
-    };
-
-    var act_all = keyboard_manager.actions.register(action_all, 'find-and-replace', 'jupyter-notebook');
-
-    keyboard_manager.command_shortcuts.add_shortcuts({
-        'f': 'jupyter-notebook:find-and-replace'
-    });
-  };
-
-
-  return {load:load};
-});
diff --git a/notebook/static/notebook/js/shortcuteditor.js b/notebook/static/notebook/js/shortcuteditor.js
deleted file mode 100644
index 3fa76cd04..000000000
--- a/notebook/static/notebook/js/shortcuteditor.js
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    "jquery",
-    "notebook/js/quickhelp",
-    "base/js/dialog",
-    "components/marked/lib/marked"
-], function (
-    $,
-    QH,
-    dialog,
-    marked
-) {
-
-
-/**
- * Humanize the action name to be consumed by user.
- * internally the actions name are of the form
- * <namespace>:<description-with-dashes>
- * we drop <namespace> and replace dashes for space.
- */
-var humanize_action_id = function(str) {
-  return str.split(':')[1].replace(/-/g, ' ').replace(/_/g, '-');
-};
-
-/**
- * given an action id return 'command-shortcut', 'edit-shortcut' or 'no-shortcut'
- * for the action. This allows us to tag UI in order to visually distinguish
- * Wether an action have a keybinding or not.
- **/
-
-var KeyBinding = createReactClass({
-  displayName: 'KeyBindings',
-  getInitialState: function() {
-    return {shrt:''};
-  },
-  handleShrtChange: function (element){
-    this.setState({shrt:element.target.value});
-  },
-  render: function(){
-    var that = this;
-    var available = this.props.available(this.state.shrt);
-    var empty = (this.state.shrt === '');
-    var binding_setter = function(){
-      if (available) { 
-        that.props.onAddBindings(that.state.shrt, that.props.ckey);
-      }
-      that.state.shrt='';
-      event.preventDefault();
-      return false;
-    };
-    return React.createElement('form', {className:'jupyter-keybindings',
-            onSubmit: binding_setter
-        },
-              React.createElement('i', {className: "pull-right fa fa-plus", alt: 'add-keyboard-shortcut',
-                  onClick: binding_setter
-              }),
-              React.createElement('input', {
-                                      type:'text', 
-                               placeholder:'add shortcut', 
-                                 className:'pull-right'+((available||empty)?'':' alert alert-danger'),
-                                     value:that.state.shrt,
-                                  onChange:that.handleShrtChange
-              }),
-              that.props.shortcuts ? that.props.shortcuts.map(function (item, index) {
-                return React.createElement('span', {className: 'pull-right'},
-                  React.createElement('kbd', {}, [
-                    item.h,
-                    React.createElement('i', {className: "fa fa-times", alt: 'remove '+item.h,
-                      onClick:function () {
-                        that.props.unbind(item.raw);
-                      }
-                    })
-                  ])
-                );
-              }): null,
-              React.createElement('div', {title: '(' + that.props.ckey + ')' ,
-                className:'jupyter-keybindings-text'}, that.props.display )
-      );
-  }
-});
-
-var KeyBindingList = createReactClass({
-  displayName: 'KeyBindingList',
-  getInitialState: function(){
-    return {data:[]};
-  },
-  componentDidMount: function(){
-      this.setState({data:this.props.callback()});
-  },
-  render: function() {
-      var that = this;
-      var children = this.state.data.map(function (binding) {
-          return React.createElement(KeyBinding, Object.assign({}, binding, {
-          onAddBindings: function (shortcut, action) {
-              that.props.bind(shortcut, action);
-              that.setState({data:that.props.callback()});
-          },
-          available: that.props.available,
-          unbind: function (shortcut) {
-                  that.props.unbind(shortcut);
-                  that.setState({data:that.props.callback()});
-             }
-          }));
-      });
-      children.unshift(React.createElement('div', {className:'well', key:'disclamer', id:'short-key-binding-intro', dangerouslySetInnerHTML:
-            {__html: 
-            marked(
-
-            "Here you can modify the keyboard shortcuts available in "+
-            "command mode. Your changes will be stored for later sessions. "+
-            "See more [**details of defining keyboard shortcuts**](#long-key-binding-intro) below."
-            )}
-      }));
-      children.push(React.createElement('div', {className:'well', key:'disclamer', id:'long-key-binding-intro', dangerouslySetInnerHTML:
-            {__html: 
-            marked(
-
-            "This dialog allows you to modify the keyboard shortcuts available in command mode. "+ 
-            "Any changes will be persisted between sessions and across environments. "+
-            "You can define two kinds of shortcuts: **key combinations** and **key sequences**.\n"+
-            "\n"+
-            " - **Key Combinations**:\n"+
-            "   - Use hyphens `-` to represent keys that should be pressed at the same time.\n"+
-            "   - This is designed for use with *modifier* keys: `Cmd`, `Ctrl`, `Alt` ,`Meta`, "+
-            "`Cmdtrl`, and `Shift`.\n"+ 
-            "       - `Cmdtrl` acts like `Cmd` on OS X/MacOS and `Ctrl` on Windows/Linux.\n"+
-            "   - At most, one non-modifier key can exist in a key combination.\n"+
-            "   - Multiple modifier keys can exist in a key combination.\n"+
-            "   - Modifier keys need to precede the non-modifier key in a combination.\n"+
-            "   - *Valid Examples*: `Shift-a`, `Ctrl-;`, or `Ctrl-Shift-a`. \n"+
-            "   - *Invalid Example*s: `a-b` and `a-Ctrl-Shift`. \n"+
-            " - **Key Sequences**:\n"+
-            "   - Use commas `,` to represent keys that should be pressed in sequence.\n"+
-            "   - The order in which keys must be pressed exactly matches the left-to-right order of "+
-            "the characters in the sequence, with no interruptions.\n"+
-            "     - E.g., `h,a,l,t` would be triggered by typing <kbd>h</kbd> <kbd>a</kbd> "+
-            "<kbd>l</kbd> <kbd>t</kbd> but not <kbd>h</kbd> <kbd>a</kbd> <kbd>a</kbd> <kbd>l</kbd> "+
-            "<kbd>t</kbd> or <kbd>a</kbd>  <kbd>h</kbd> <kbd>l</kbd> <kbd>t</kbd>.\n"+
-            "   - Sequences can include the same key multiple times (e.g., `d,d`).\n"+
-            "   - You cannot include any pairs of sequences where one is a 'prefix' the other.\n"+
-            "     - E.g., `d,d,d` cannot be used a the same time as `d,d`.\n"+ 
-            "   - Key combinations are unique elements that can be used in a sequence.\n"+ 
-            "     - E.g., `Ctrl-d,d` and `d,d` can exist at the same time and are both valid key sequences.\n"+
-            "\n"+
-            "**Additional notes**:\n"+
-            "\n"+
-            "The case in which elements are written does not change the binding's meaning. "+
-            "E.g., `Ctrl-D` and `cTrl-d` are the same key binding. "+
-            "Thus, `Shift` needs to be explicitly included if it is part of the key binding. "+
-            "So, for example, if you set a command to be activated by `Shift-D,D`, the second `d` "+
-            "cannot be pressed at the same time as the `Shift` modifier key.\n"+
-            "\n"+
-            "Valid modifiers are specified by writing out their names explicitly: "+
-            "e.g., `Shift`, `Cmd`, `Ctrl`, `Alt` ,`Meta`, `Cmdtrl`. You cannot use the symbol equivalents "+
-            "(e.g., `⇧`, `⌘`, `⌃`, `⌥`); refer to developer docs for the corresponding keys "+
-            "(the mapping of which depends on the platform you are using)."+
-            "You can hover on the name/description of a command to see its exact internal name and "+
-            "differentiate from actions defined in various plugins. \n"+
-            "\n"+
-            "Changing the keybindings of edit mode is not currently available."
-            )}
-      }));
-      return React.createElement('div',{}, children);
-    }
-});
-
-var get_shortcuts_data = function(notebook) {
-    var actions = Object.keys(notebook.keyboard_manager.actions._actions);
-    var src = [];
-
-    for (var i = 0; i < actions.length; i++) {
-      var action_id = actions[i];
-      var action = notebook.keyboard_manager.actions.get(action_id);
-
-      var shortcuts = notebook.keyboard_manager.command_shortcuts.get_action_shortcuts(action_id);
-      var hshortcuts = [];
-      if (shortcuts.length > 0) {
-        hshortcuts = shortcuts.map(function (raw) {
-          return {h:QH._humanize_sequence(raw),raw:raw};}
-        );
-      }
-      src.push({
-        display: humanize_action_id(action_id),
-        shortcuts: hshortcuts,
-        key:action_id, // react specific thing
-        ckey: action_id
-      });
-    }
-    return src;
-};
-
-
-var ShortcutEditor = function(notebook) {
-
-    if(!notebook){
-      throw new Error("CommandPalette takes a notebook non-null mandatory argument");
-    }
-
-    var body =  $('<div>');
-    var mod = dialog.modal({
-        notebook: notebook,
-        keyboard_manager: notebook.keyboard_manager,
-        title : "Edit Command mode Shortcuts",
-        body : body,
-        buttons : {
-            OK : {}
-        }
-    });
-    
-    var src = get_shortcuts_data(notebook);
-
-    mod.addClass("modal_stretch");
-
-    mod.modal('show');
-    ReactDOM.render(
-        React.createElement(KeyBindingList, {
-            callback: function () { return  get_shortcuts_data(notebook);},
-            bind: function (shortcut, command) {
-                return notebook.keyboard_manager.command_shortcuts._persist_shortcut(shortcut, command);
-            },
-            unbind: function (shortcut) {
-                return notebook.keyboard_manager.command_shortcuts._persist_remove_shortcut(shortcut);
-            },
-            available: function (shrt) { return notebook.keyboard_manager.command_shortcuts.is_available_shortcut(shrt);}
-          }),
-        body.get(0)
-    );
-};
-    return {ShortcutEditor: ShortcutEditor};
-});
diff --git a/notebook/static/notebook/js/textcell.js b/notebook/static/notebook/js/textcell.js
deleted file mode 100644
index ff97c6692..000000000
--- a/notebook/static/notebook/js/textcell.js
+++ /dev/null
@@ -1,654 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n',
-    'notebook/js/cell',
-    'base/js/markdown',
-    'services/config',
-    'notebook/js/celltoolbar',
-    'codemirror/lib/codemirror',
-    'codemirror/mode/gfm/gfm',
-    'notebook/js/codemirror-ipythongfm',
-    'bidi/bidi'
-], function(
-    $,
-    utils,
-    i18n,
-    cell,
-    markdown,
-    configmod,
-    celltoolbar,
-    CodeMirror,
-    gfm,
-    ipgfm,
-    bidi
-    ) {
-    "use strict";
-    function encodeURIandParens(uri){return encodeURI(uri).replace('(','%28').replace(')','%29')}
-
-    /**
-     * Given a file name and a list of existing file names, returns a new file name
-     * that is not in the existing list. If the file name already exists, a new one with
-     * an incremented index is returned instead.
-     *
-     * Example:
-     *  addIndexToFileName('attachment.png',
-     *                    ['attachment.png', 'attachment-3.png']) returns 'attachment-4.png'
-     *
-     * @param  {string} fileName  - original file name
-     * @param  {string} fileNames - other file names
-     * @return {string}             the original file name or one with a postfix
-     *                              index (before the extension, if one exists)
-     */
-    function addIndexToFileName(fileName, fileNames) {
-        if (fileNames === undefined) {
-            return fileName;
-        }
-        var lastDot = fileName.lastIndexOf('.');
-        var pre = fileName.substr(0, lastDot);
-        var optionalExt = fileName.substr(lastDot);
-
-        var indexMatch = '-(\\d+)';
-        // Make the index match optional so we can match both 'fileName.png' and 'fileName-2.png'
-        // The ?: makes it a non-capturing group.
-        var optionalIndexMatch = '(?:' + indexMatch + ')?';
-
-        var regex = new RegExp(pre + optionalIndexMatch + optionalExt);
-
-        var highestIndex = 0;
-        for (var existingFileName in fileNames) {
-            var match = existingFileName.match(regex);
-            var index = match[1];
-            if (index === undefined) {
-                index = 1;
-            }
-            else {
-                index = parseInt(index);
-            }
-            if (index > highestIndex) {
-                highestIndex = index;
-            }
-        }
-
-        if (highestIndex > 0) {
-            return pre + "-" + (highestIndex + 1) + optionalExt;
-        }
-        else {
-            return fileName;
-        }
-    };
-
-    var Cell = cell.Cell;
-
-    var TextCell = function (options) {
-        /**
-         * Constructor
-         *
-         * Construct a new TextCell, codemirror mode is by default 'htmlmixed', 
-         * and cell type is 'text' cell start as not redered.
-         *
-         * Parameters:
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance 
-         *          config: dictionary
-         *          keyboard_manager: KeyboardManager instance 
-         *          notebook: Notebook instance
-         */
-        options = options || {};
-
-        // in all TextCell/Cell subclasses
-        // do not assign most of members here, just pass it down
-        // in the options dict potentially overwriting what you wish.
-        // they will be assigned in the base class.
-        this.notebook = options.notebook;
-        this.events = options.events;
-        this.config = options.config;
-
-        // we cannot put this as a class key as it has handle to "this".
-        Cell.apply(this, [{
-                    config: options.config, 
-                    keyboard_manager: options.keyboard_manager, 
-                    events: this.events}]);
-
-        this.cell_type = this.cell_type || 'text';
-        this.rendered = false;
-    };
-
-    TextCell.prototype = Object.create(Cell.prototype);
-
-    TextCell.options_default = {
-        cm_config : {
-            mode: 'htmlmixed',
-            lineWrapping : true,
-        }
-    };
-
-
-    /**
-     * Create the DOM element of the TextCell
-     * @method create_element
-     * @private
-     */
-    TextCell.prototype.create_element = function () {
-        Cell.prototype.create_element.apply(this, arguments);
-        var that = this;
-
-        var cell = $("<div>").addClass('cell text_cell');
-        cell.attr('tabindex','2');
-
-        var prompt = $('<div/>').addClass('prompt input_prompt');
-        cell.append(prompt);
-        var inner_cell = $('<div/>').addClass('inner_cell');
-        this.celltoolbar = new celltoolbar.CellToolbar({
-            cell: this, 
-            notebook: this.notebook});
-        inner_cell.append(this.celltoolbar.element);
-        var input_area = $('<div/>').addClass('input_area').attr("aria-label", i18n.msg._("Edit Markup Text here"));
-        this.code_mirror = new CodeMirror(input_area.get(0), this._options.cm_config);
-        // In case of bugs that put the keyboard manager into an inconsistent state,
-        // ensure KM is enabled when CodeMirror is focused:
-        this.code_mirror.on('focus', function () {
-            if (that.keyboard_manager) {
-                that.keyboard_manager.enable();
-            }
-            that.code_mirror.setOption('readOnly', !that.is_editable());
-        });
-        this.code_mirror.on('keydown', $.proxy(this.handle_keyevent,this))
-        // The tabindex=-1 makes this div focusable.
-        var render_area = $('<div/>').addClass('text_cell_render rendered_html')
-            .attr('tabindex','-1');
-        inner_cell.append(input_area).append(render_area);
-        cell.append(inner_cell);
-        this.element = cell;
-        this.inner_cell = inner_cell;
-    };
-
-
-    // Cell level actions
-
-    TextCell.prototype.add_attachment = function (key, mime_type, b64_data) {
-        /**
-         * Add a new attachment to this cell
-         */
-        this.attachments[key] = {};
-        this.attachments[key][mime_type] = b64_data;
-    };
-
-    TextCell.prototype.select = function () {
-        var cont = Cell.prototype.select.apply(this, arguments);
-        if (cont) {
-            if (this.mode === 'edit') {
-                this.code_mirror.refresh();
-            }
-        }
-        return cont;
-    };
-
-    TextCell.prototype.unrender = function () {
-        var cont = Cell.prototype.unrender.apply(this);
-        if (cont) {
-            var text_cell = this.element;
-            if (this.get_text() === this.placeholder) {
-                this.set_text('');
-            }
-            this.refresh();
-        }
-        return cont;
-    };
-
-    TextCell.prototype.execute = function () {
-        this.render();
-    };
-
-    /**
-     * setter: {{#crossLink "TextCell/set_text"}}{{/crossLink}}
-     * @method get_text
-     * @return {string} CodeMirror current text value
-     */
-    TextCell.prototype.get_text = function() {
-        return this.code_mirror.getValue();
-    };
-
-    /**
-     * @param {string} text - Codemiror text value
-     * @see TextCell#get_text
-     * @method set_text
-     * */
-    TextCell.prototype.set_text = function(text) {
-        this.code_mirror.setValue(text);
-        this.unrender();
-        this.code_mirror.refresh();
-    };
-
-    /**
-     * setter :{{#crossLink "TextCell/set_rendered"}}{{/crossLink}}
-     * @method get_rendered
-     * */
-    TextCell.prototype.get_rendered = function() {
-        return this.element.find('div.text_cell_render').html();
-    };
-
-    /**
-     * @method set_rendered
-     */
-    TextCell.prototype.set_rendered = function(text) {
-        this.element.find('div.text_cell_render').html(text);
-    };
-
-
-    /**
-     * Create Text cell from JSON
-     * @param {json} data - JSON serialized text-cell
-     * @method fromJSON
-     */
-    TextCell.prototype.fromJSON = function (data) {
-        Cell.prototype.fromJSON.apply(this, arguments);
-        if (data.cell_type === this.cell_type) {
-            if (data.attachments !== undefined) {
-                this.attachments = data.attachments;
-            }
-
-            if (data.source !== undefined) {
-                this.set_text(data.source);
-                // make this value the starting point, so that we can only undo
-                // to this state, instead of a blank cell
-                this.code_mirror.clearHistory();
-                // TODO: This HTML needs to be treated as potentially dangerous
-                // user input and should be handled before set_rendered.
-                this.set_rendered(data.rendered || '');
-                this.rendered = false;
-                this.render();
-            }
-        }
-    };
-
-    /** Generate JSON from cell
-     * @param {bool} gc_attachments - If true, will remove unused attachments
-     *               from the returned JSON
-     * @return {object} cell data serialised to json
-     */
-    TextCell.prototype.toJSON = function (gc_attachments) {
-        if (gc_attachments === undefined) {
-            gc_attachments = false;
-        }
-
-        var data = Cell.prototype.toJSON.apply(this);
-        data.source = this.get_text();
-        if (data.source == this.placeholder) {
-            data.source = "";
-        }
-
-        // We deepcopy the attachments so copied cells don't share the same
-        // objects
-        if (Object.keys(this.attachments).length > 0) {
-            if (gc_attachments) {
-                // Garbage collect unused attachments : The general idea is to
-                // render the text, and find used attachments like when we
-                // substitute them in render()
-                var that = this;
-                data.attachments = {};
-                // To find attachments, rendering to HTML is easier than
-                // searching in the markdown source for the multiple ways you
-                // can reference an image in markdown (using []() or a
-                // HTML <img>)
-                var text = this.get_text();
-                markdown.render(text, {
-                    sanitize: true,
-                }, function (err, html) {
-                    html.find('img[src^="attachment:"]').each(function (i, h) {
-                        h = $(h);
-                        var key = h.attr('src').replace(/^attachment:/, '');
-                        if (that.attachments.hasOwnProperty(key)) {
-                            data.attachments[key] = JSON.parse(JSON.stringify(
-                                that.attachments[key]));
-                        }
-
-                        // This is to avoid having the browser do a GET request
-                        // on the invalid attachment: URL
-                        h.attr('src', '');
-                    });
-                });
-                if (data.attachments.length === 0) {
-                    // omit attachments dict if no attachments
-                    delete data.attachments;
-                }
-            } else {
-                data.attachments = JSON.parse(JSON.stringify(this.attachments));
-            }
-        }
-        return data;
-    };
-
-
-    var MarkdownCell = function (options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance 
-         *          config: ConfigSection instance
-         *          keyboard_manager: KeyboardManager instance 
-         *          notebook: Notebook instance
-         */
-        options = options || {};
-        var config_default = utils.mergeopt(TextCell, MarkdownCell.options_default);
-        this.class_config = new configmod.ConfigWithDefaults(options.config,
-                                            config_default, 'MarkdownCell');
-        TextCell.apply(this, [$.extend({}, options, {config: options.config})]);
-
-        this.cell_type = 'markdown';
-
-        // Used to keep track of drag events
-        this.drag_counter = 0;
-    };
-
-    MarkdownCell.options_default = {
-        cm_config: {
-            mode: 'ipythongfm',
-        },
-        placeholder: "Type *Markdown* and LaTeX: $\\alpha^2$"
-    };
-
-    MarkdownCell.prototype = Object.create(TextCell.prototype);
-
-    MarkdownCell.prototype.set_heading_level = function (level) {
-        /**
-         * make a markdown cell a heading
-         */
-        level = level || 1;
-        var source = this.get_text();
-        source = source.replace(/^(#*)\s?/,
-            new Array(level + 1).join('#') + ' ');
-        this.set_text(source);
-        this.refresh();
-        if (this.rendered) {
-            this.render();
-        }
-    };
-
-    MarkdownCell.prototype.select = function () {
-        var cont = TextCell.prototype.select.apply(this, arguments);
-        if (cont) {
-            this.notebook.set_insert_image_enabled(!this.rendered);
-        }
-    };
-
-    MarkdownCell.prototype.unrender = function () {
-        var cont = TextCell.prototype.unrender.apply(this);
-        this.notebook.set_insert_image_enabled(true);
-    };
-
-    MarkdownCell.prototype.insert_inline_image_from_blob = function(blob) {
-        /**
-         * Insert markup for an inline image at the current cursor position.
-         * This works as follow :
-         * - We insert the base64-encoded blob data into the cell attachments
-         *   dictionary, keyed by the filename.
-         * - We insert an img tag with a 'attachment:key' src that refers to
-         *   the attachments entry.
-         *
-         * Parameters:
-         *  file: Blob
-         *      The JS Blob object (e.g. from the DataTransferItem)
-         */
-        var that = this;
-        var pos = this.code_mirror.getCursor();
-        var reader = new FileReader();
-        // We can get either a named file (drag'n'drop) or a blob (copy/paste)
-        // We generate names for blobs
-        var key;
-        if (blob.name !== undefined) {
-            key = encodeURIandParens(blob.name);
-
-            // Add an index to the filename if we already have one with the same name
-            key = addIndexToFileName(key, that.attachments);
-        } else {
-            key = '_auto_' + Object.keys(that.attachments).length;
-        }
-
-        reader.onloadend = function() {
-            var d = utils.parse_b64_data_uri(reader.result);
-            var blobData = d[1]
-
-            if (blob.type != d[0]) {
-                // TODO(julienr): Not sure what we should do in this case
-                console.log('File type (' + blob.type + ') != data-uri ' +
-                            'type (' + d[0] + ')');
-            }
-
-            // If we have the same attachment already under another key, we change the key to that.
-            // This ensures we don't create two attachments if pasting the same image twice.
-
-            for (var savedKey in that.attachments) {
-                var attachment = that.attachments[savedKey];
-                if (attachment === undefined) continue;
-
-                var savedBlob = attachment[blob.type];
-                if (savedBlob === blobData) {
-                    key = savedKey;
-                }
-            }
-
-            that.add_attachment(key, blob.type, blobData);
-            var img_md = '![' + key + '](attachment:' + key + ')';
-            that.code_mirror.replaceRange(img_md, pos);
-        }
-        reader.readAsDataURL(blob);
-    };
-
-    /**
-     * @method render
-     */
-    MarkdownCell.prototype.render = function () {
-        // We clear the dropzone here just in case the dragenter/leave
-        // logic of bind_events wasn't 100% successful.
-        this.drag_counter = 0;
-        this.inner_cell.removeClass('dropzone');
-
-        var cont = TextCell.prototype.render.apply(this);
-        if (cont) {
-            var that = this;
-            var text = this.get_text();
-            var math = null;
-            if (text === "") { text = this.placeholder; }
-            markdown.render(text, {
-                with_math: true,
-                clean_tables: true,
-                sanitize: true,
-            }, function (err, html) {
-                // add anchors to headings
-                html.find(":header").addBack(":header").each(function (i, h) {
-                    h = $(h);
-                    var hash = h.text().replace(/ /g, '-');
-                    h.attr('id', hash);
-                    h.append(
-                        $('<a/>')
-                            .addClass('anchor-link')
-                            .attr('href', '#' + hash)
-                            .text('¶')
-                            .on('click',function(){
-                                setTimeout(function(){that.unrender(); that.render()}, 100)
-                            })
-                    );
-                });
-                // links in markdown cells should open in new tabs
-                html.find("a[href]").not('[href^="#"]').attr("target", "_blank");
-                // replace attachment:<key> by the corresponding entry
-                // in the cell's attachments
-                html.find('img[src^="attachment:"]').each(function (i, h) {
-                  h = $(h);
-                  var key = h.attr('src').replace(/^attachment:/, '');
-
-                  if (that.attachments.hasOwnProperty(key)) {
-                    var att = that.attachments[key];
-                    var mime = Object.keys(att)[0];
-                    h.attr('src', 'data:' + mime + ';base64,' + att[mime]);
-                  } else {
-                    h.attr('src', '');
-                  }
-                });
-                that.set_rendered(html);
-                that.typeset();
-                that.events.trigger("rendered.MarkdownCell", {cell: that});
-            });
-        }
-        return cont;
-    };
-
-    /** @method bind_events **/
-    MarkdownCell.prototype.bind_events = function () {
-        TextCell.prototype.bind_events.apply(this);
-        var that = this;
-
-        this.element.dblclick(function () {
-            var cont = that.unrender();
-            if (cont) {
-                that.focus_editor();
-            }
-        });
-
-        var attachment_regex = /^image\/.*$/;
-
-        // Event handlers to allow users to insert image using either
-        // drag'n'drop or copy/paste
-        var div = that.code_mirror.getWrapperElement();
-        $(div).on('paste', function(evt) {
-            var data = evt.originalEvent.clipboardData;
-            var items = data.items;
-            if (items !== undefined) {
-                for (var i = 0; i < items.length; ++i) {
-                    var item = items[i];
-                    if (item.kind == 'file' && attachment_regex.test(item.type)) {
-                        // TODO(julienr): This does not stop code_mirror from pasting
-                        // the filename.
-                        evt.stopPropagation();
-                        evt.preventDefault();
-                        that.insert_inline_image_from_blob(item.getAsFile());
-                    }
-                }
-            }
-        });
-
-        // Allow drag event if the dragged file can be used as an attachment
-        // If we use this.code_mirror.on to register a "dragover" handler, we
-        // get an empty dataTransfer
-        this.code_mirror.on("dragover", function(cm, evt) {
-            if (utils.dnd_contain_file(evt)) {
-                evt.preventDefault();
-            }
-        });
-
-        // We want to display a visual indicator that the drop is possible.
-        // The dragleave event is fired when we hover a child element (which
-        // is often immediately after we got the dragenter), so we keep track
-        // of the number of dragenter/dragleave we got, as discussed here :
-        // https://stackoverflow.com/q/7110353/116067
-        // This doesn't seem to be 100% reliable, so we clear the dropzone
-        // class when the cell is rendered as well
-        this.code_mirror.on("dragenter", function(cm, evt) {
-            if (utils.dnd_contain_file(evt)) {
-                that.drag_counter++;
-                that.inner_cell.addClass('dropzone');
-            }
-            evt.preventDefault();
-            evt.stopPropagation();
-        });
-
-        this.code_mirror.on("dragleave", function(cm, evt) {
-            that.drag_counter--;
-            if (that.drag_counter <= 0) {
-                that.inner_cell.removeClass('dropzone');
-            }
-            evt.preventDefault();
-            evt.stopPropagation();
-        });
-
-        this.code_mirror.on("drop", function(cm, evt) {
-            that.drag_counter = 0;
-            that.inner_cell.removeClass('dropzone');
-
-            var files = evt.dataTransfer.files;
-            for (var i = 0; i < files.length; ++i) {
-                var file = files[i];
-                if (attachment_regex.test(file.type)) {
-                    // Prevent the default code_mirror 'drop' event handler
-                    // (which inserts the file content) if this is a
-                    // recognized media file
-                    evt.stopPropagation();
-                    evt.preventDefault();
-                    that.insert_inline_image_from_blob(file);
-                }
-            }
-        });
-    };
-
-
-    var RawCell = function (options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance 
-         *          config: ConfigSection instance
-         *          keyboard_manager: KeyboardManager instance 
-         *          notebook: Notebook instance
-         */
-        options = options || {};
-        var config_default = utils.mergeopt(TextCell, RawCell.options_default);
-        this.class_config = new configmod.ConfigWithDefaults(options.config,
-                                            config_default, 'RawCell');
-        TextCell.apply(this, [$.extend({}, options, {config: options.config})]);
-        this.cell_type = 'raw';
-    };
-
-    RawCell.options_default = {
-        highlight_modes : {
-            'diff'         :{'reg':[/^diff/]}
-        },
-        placeholder : i18n.msg._("Write raw LaTeX or other formats here, for use with nbconvert. " +
-            "It will not be rendered in the notebook. " +
-            "When passing through nbconvert, a Raw Cell's content is added to the output unmodified."),
-    };
-
-    RawCell.prototype = Object.create(TextCell.prototype);
-
-    /** @method bind_events **/
-    RawCell.prototype.bind_events = function () {
-        TextCell.prototype.bind_events.apply(this);
-        var that = this;
-        this.element.focusout(function() {
-            that.auto_highlight();
-            that.render();
-        });
-
-        this.code_mirror.on('focus', function() { that.unrender(); });
-    };
-
-    /** @method render **/
-    RawCell.prototype.render = function () {
-        var cont = TextCell.prototype.render.apply(this);
-        if (cont){
-            var text = this.get_text();
-            if (text === "") { text = this.placeholder; }
-            this.set_text(text);
-            this.element.removeClass('rendered');
-            this.auto_highlight();
-        }
-        return cont;
-    };
-
-    var textcell = {
-        TextCell: TextCell,
-        MarkdownCell: MarkdownCell,
-        RawCell: RawCell
-    };
-    return textcell;
-});
diff --git a/notebook/static/notebook/js/toolbar.js b/notebook/static/notebook/js/toolbar.js
deleted file mode 100644
index 0022c4428..000000000
--- a/notebook/static/notebook/js/toolbar.js
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define(['jquery','base/js/i18n'], function($, i18n) {
-    "use strict";
-
-    /**
-     * A generic toolbar on which one can add button
-     * @class ToolBar
-     * @constructor
-     * @param {Dom_object} selector
-     */
-    var ToolBar = function (selector, options) {
-        this.selector = selector;
-        this.actions = (options||{}).actions;
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.style();
-        }
-    };
-
-    ToolBar.prototype._pseudo_actions={};
-
-
-    ToolBar.prototype.construct = function (config) {
-        for(var k=0; k<config.length; k++) {
-            this.add_buttons_group(config[k][0],config[k][1]);
-        }
-    };
-
-    /**
-     *  Add a group of button into the current toolbar.
-     *
-     *  Use a [dict of [list of action name]] to trigger
-     *  on click to the button
-     *
-     *  @example
-     *
-     *      ... todo, maybe use a list of  list to keep ordering.
-     *
-     *      [
-     *          [
-     *            [
-     *              action_name_1,
-     *              action_name_2,
-     *              action_name_3,
-     *            ],
-     *            optional_group_name
-     *          ],
-     *          ...
-     *      ]
-     *
-     *  @param list {List}
-     *      List of button of the group, with the following parameter for each :
-     *      @param list.label {string} text to show on button hover
-     *      @param list.icon {string} icon to choose from [Font Awesome](http://fortawesome.github.io/Font-Awesome)
-     *      @param list.callback {function} function to be called on button click
-     *      @param [list.id] {String} id to give to the button
-     *  @param [group_id] {String} optional id to give to the group
-     *
-     *
-     *  for private usage, the key can also be strings starting with '<' and ending with '>' to inject custom element that cannot
-     *  be bound to an action.
-     *
-     */
-    // TODO JUPYTER:
-    // get rid of legacy code that handle things that are not actions.
-    ToolBar.prototype.add_buttons_group = function (list, group_id) {
-        // handle custom call of pseudoaction binding.
-        if(typeof(list) === 'string' && list.slice(0,1) === '<' && list.slice(-1) === '>'){
-            var _pseudo_action;
-            try{
-                _pseudo_action = list.slice(1,-1);
-                this.element.append(this._pseudo_actions[_pseudo_action].call(this));
-            } catch (e) {
-                console.warn('ouch, calling ', _pseudo_action, 'does not seem to work...:', e);
-            }
-            return ;
-        }
-        var that = this;
-        var btn_group = $('<div/>').addClass("btn-group");
-        if( group_id !== undefined ) {
-            btn_group.attr('id',group_id);
-        }
-        list.forEach(function(el) {
-                var action_name;
-                var action;
-                if(typeof(el) === 'string'){
-                    action = that.actions.get(el);
-                    action_name = el;
-                } else if (el.action) {
-                    action = that.actions.get(el.action);
-                    action_name = el.action
-                }
-                var title = el.label;
-                if(action && action.help) {
-                    title = i18n.msg._(action.help) || el.label;
-                }
-                var button  = $('<button/>')
-                    .addClass('btn btn-default')
-                    .attr("aria-label", el.label)
-                    .attr("title", title)
-                    .append(
-                        $("<i/>").addClass(el.icon||(action||{icon:'fa-exclamation-triangle'}).icon).addClass('fa')
-                    );
-                if (el.label) {
-                    var label = $('<span/>').text(i18n.msg._(el.label)).addClass('toolbar-btn-label');
-                    button.append(label);
-                }
-                var id = el.id;
-                if( id !== undefined ){
-                    button.attr('id',id);
-                }
-                button.attr('data-jupyter-action', action_name);
-                var fun = el.callback|| function(){
-                    that.actions.call(action_name);
-                };
-                button.click(fun);
-                btn_group.append(button);
-        });
-        $(this.selector).append(btn_group);
-        return btn_group;
-    };
-
-    ToolBar.prototype.style = function () {
-        this.element.addClass('toolbar');
-    };
-
-    /**
-     * Show and hide toolbar
-     * @method toggle
-     */
-    ToolBar.prototype.toggle = function () {
-        this.element.toggle();
-    };
-
-    /**
-     * A simple class to hold information defining one toolbar button.
-     * @class ToolBar
-     * @constructor
-     * @param action {String} name of a Jupyter action taken when pressed
-     * @param options.label {String} short label to display on the button
-     */
-    var Button = function(action, options) {
-        this.action = action;
-        this.label = (options||{}).label;
-    };
-
-    return {
-        'ToolBar': ToolBar,
-        'Button': Button
-    };
-});
diff --git a/notebook/static/notebook/js/tooltip.js b/notebook/static/notebook/js/tooltip.js
deleted file mode 100644
index e913a3fd8..000000000
--- a/notebook/static/notebook/js/tooltip.js
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'base/js/i18n'
-], function($, utils, i18n) {
-    "use strict";
-
-    // tooltip constructor
-    var Tooltip = function (events) {
-        var that = this;
-        this.events = events;
-        this.time_before_tooltip = 1200;
-
-        // handle to html
-        this.tooltip = $('#tooltip');
-        this._hidden = true;
-
-        // variable for consecutive call
-        this._old_cell = null;
-        this._old_request = null;
-        this._consecutive_counter = 0;
-
-        // 'sticky ?'
-        this._sticky = false;
-
-        // display tooltip if the docstring is empty?
-        this._hide_if_no_docstring = false;
-
-        // contain the button in the upper right corner
-        this.buttons = $('<div/>').addClass('tooltipbuttons');
-
-        // will contain the docstring
-        this.text = $('<div/>').addClass('tooltiptext').addClass('smalltooltip');
-
-        // build the buttons menu on the upper right
-        // expand the tooltip to see more
-        var expandlink = $('<a/>').attr('href', "#").attr('role', "button").addClass('ui-button')
-        .attr('id', 'expanbutton').attr('title', i18n.msg._('Grow the tooltip vertically (press shift-tab twice)')).click(function () {
-            that.expand();
-            event.preventDefault();
-        }).append(
-        $('<span/>').text('Expand').addClass('ui-icon').addClass('ui-icon-plus'));
-
-        // open in pager
-        var morelink = $('<a/>').attr('href', "#").attr('role', "button").addClass('ui-button').attr('title', i18n.msg._('show the current docstring in pager (press shift-tab 4 times)'));
-        var morespan = $('<span/>').text(i18n.msg._('Open in Pager')).addClass('ui-icon').addClass('ui-icon-arrowstop-l-n');
-        morelink.append(morespan);
-        morelink.click(function () {
-            that.showInPager(that._old_cell);
-            event.preventDefault();
-        });
-
-        // close the tooltip
-        var closelink = $('<a/>').attr('href', "#").attr('role', "button").addClass('ui-button');
-        var closespan = $('<span/>').text(i18n.msg._('Close')).addClass('ui-icon').addClass('ui-icon-close');
-        closelink.append(closespan);
-        closelink.click(function () {
-            that.remove_and_cancel_tooltip(true);
-            event.preventDefault();
-        });
-
-        this._clocklink = $('<a/>').attr('href', "#");
-        this._clocklink.attr('role', "button");
-        this._clocklink.addClass('ui-button');
-        this._clocklink.attr('title', i18n.msg._('Tooltip will linger for 10 seconds while you type'));
-        var clockspan = $('<span/>').text(i18n.msg._('Close'));
-        clockspan.addClass('ui-icon');
-        clockspan.addClass('ui-icon-clock');
-        this._clocklink.append(clockspan);
-        this._clocklink.click(function () {
-            that.cancel_stick();
-            event.preventDefault();
-        });
-
-
-
-
-        //construct the tooltip
-        // add in the reverse order you want them to appear
-        this.buttons.append(closelink);
-        this.buttons.append(expandlink);
-        this.buttons.append(morelink);
-        this.buttons.append(this._clocklink);
-        this._clocklink.hide();
-
-
-        // we need a phony element to make the small arrow
-        // of the tooltip in css
-        // we will move the arrow later
-        this.arrow = $('<div/>').addClass('pretooltiparrow');
-        this.tooltip.append(this.buttons);
-        this.tooltip.append(this.arrow);
-        this.tooltip.append(this.text);
-
-        // function that will be called if you press tab 1, 2, 3... times in a row
-        this.tabs_functions = [function (cell, text, cursor) {
-            that._request_tooltip(cell, text, cursor);
-        }, function () {
-            that.expand();
-        }, function () {
-            that.stick();
-        }, function (cell) {
-            that.cancel_stick();
-            that.showInPager(cell);
-        }];
-        // call after all the tabs function above have bee call to clean their effects
-        // if necessary
-        this.reset_tabs_function = function (cell, text) {
-            this._old_cell = (cell) ? cell : null;
-            this._old_request = (text) ? text : null;
-            this._consecutive_counter = 0;
-        };
-    };
-
-    Tooltip.prototype.is_visible = function () {
-        return !this._hidden;
-    };
-
-    Tooltip.prototype.showInPager = function (cell) {
-        /**
-         * reexecute last call in pager by appending ? to show back in pager
-         */
-        this.events.trigger('open_with_text.Pager', this._reply.content);
-        this.remove_and_cancel_tooltip();
-    };
-
-    // grow the tooltip vertically
-    Tooltip.prototype.expand = function () {
-        this.text.removeClass('smalltooltip');
-        this.text.addClass('bigtooltip');
-        $('#expanbutton').hide('slow');
-    };
-
-    // deal with all the logic of hiding the tooltip
-    // and reset its status
-    Tooltip.prototype._hide = function () {
-        this._hidden = true;
-        this.tooltip.fadeOut('fast');
-        $('#expanbutton').show('slow');
-        this.text.removeClass('bigtooltip');
-        this.text.addClass('smalltooltip');
-        // keep scroll top to be sure to always see the first line
-        this.text.scrollTop(0);
-        this.code_mirror = null;
-    };
-
-    // return true on successfully removing a visible tooltip; otherwise return
-    // false.
-    Tooltip.prototype.remove_and_cancel_tooltip = function (force) {
-        /**
-         * note that we don't handle closing directly inside the calltip
-         * as in the completer, because it is not focusable, so won't
-         * get the event.
-         */
-        this.cancel_pending();
-        if (!this._hidden) {
-          if (force || !this._sticky) {
-              this.cancel_stick();
-              this._hide();
-          }
-          this.reset_tabs_function();
-          return true;
-        } else {
-          return false;
-        }
-    };
-
-    // cancel autocall done after '(' for example.
-    Tooltip.prototype.cancel_pending = function () {
-        if (this._tooltip_timeout !== null) {
-            clearTimeout(this._tooltip_timeout);
-            this._tooltip_timeout = null;
-        }
-    };
-
-    // will trigger tooltip after timeout
-    Tooltip.prototype.pending = function (cell, hide_if_no_docstring) {
-        var that = this;
-        this._tooltip_timeout = setTimeout(function () {
-            that.request(cell, hide_if_no_docstring);
-        }, that.time_before_tooltip);
-    };
-
-    // easy access for julia monkey patching.
-    Tooltip.last_token_re = /[a-z_][0-9a-z._]*$/gi;
-
-    Tooltip.prototype._request_tooltip = function (cell, text, cursor_pos) {
-        var callbacks = $.proxy(this._show, this);
-        var msg_id = cell.kernel.inspect(text, cursor_pos, callbacks);
-    };
-
-    // make an immediate completion request
-    Tooltip.prototype.request = function (cell, hide_if_no_docstring) {
-        /**
-         * request(codecell)
-         * Deal with extracting the text from the cell and counting
-         * call in a row
-         */
-        this.cancel_pending();
-        var editor = cell.code_mirror;
-        var cursor = editor.getCursor();
-        var text = cell.get_text();
-        var cursor_pos = utils.js_idx_to_char_idx(editor.indexFromPos(cursor), text);
-
-        this._hide_if_no_docstring = hide_if_no_docstring;
-
-        if(editor.somethingSelected()){
-            // get only the most recent selection.
-            text = editor.getSelection();
-        }
-
-        // need a permanent handle to code_mirror for future auto recall
-        this.code_mirror = editor;
-
-        // now we treat the different number of keypress
-        // first if same cell, same text, increment counter by 1
-        if (this._old_cell == cell && this._old_request == text && this._hidden === false) {
-            this._consecutive_counter++;
-        } else {
-            // else reset
-            this.cancel_stick();
-            this.reset_tabs_function (cell, text);
-        }
-
-        this.tabs_functions[this._consecutive_counter](cell, text, cursor_pos);
-
-        // then if we are at the end of list function, reset
-        if (this._consecutive_counter == this.tabs_functions.length) {
-            this.reset_tabs_function (cell, text, cursor);
-        }
-
-        return;
-    };
-
-    // cancel the option of having the tooltip to stick
-    Tooltip.prototype.cancel_stick = function () {
-        clearTimeout(this._stick_timeout);
-        this._stick_timeout = null;
-        this._clocklink.hide('slow');
-        this._sticky = false;
-    };
-
-    // put the tooltip in a sticky state for 10 seconds
-    // it won't be removed by remove_and_cancel() unless you called with
-    // the first parameter set to true.
-    // remove_and_cancel_tooltip(true)
-    Tooltip.prototype.stick = function (time) {
-        time = (time !== undefined) ? time : 10;
-        var that = this;
-        this._sticky = true;
-        this._clocklink.show('slow');
-        this._stick_timeout = setTimeout(function () {
-            that._sticky = false;
-            that._clocklink.hide('slow');
-        }, time * 1000);
-    };
-
-    // should be called with the kernel reply to actually show the tooltip
-    Tooltip.prototype._show = function (reply) {
-        /**
-         * move the bubble if it is not hidden
-         * otherwise fade it
-         */
-        this._reply = reply;
-        var content = reply.content;
-        if (!content.found) {
-            // object not found, nothing to show
-            return;
-        }
-        this.name = content.name;
-
-        // do some math to have the tooltip arrow on more or less on left or right
-        // position of the editor
-        var cm_pos = $(this.code_mirror.getWrapperElement()).position();
-        var cell_pos = $(this.code_mirror.getWrapperElement().offsetParent).position();
-
-        // anchor and head positions are local within CodeMirror element
-        var anchor = this.code_mirror.cursorCoords(false, 'local');
-        var head = this.code_mirror.cursorCoords(true, 'local');
-        // locate the target at the center of anchor, head
-        var center_left = (head.left + anchor.left) / 2;
-        // locate the left edge of the tooltip, at most 450 px left of the arrow
-        var edge_left = Math.max(center_left - 450, 0);
-        // locate the arrow at the cursor. A 24 px offset seems necessary.
-        var arrow_left = center_left - edge_left - 24;
-        
-        // locate left, top within container element
-        var left = (cell_pos.left + cm_pos.left + edge_left) + 'px';
-        var top = (cell_pos.top + cm_pos.top + head.bottom + 10) + 'px';
-
-        if (this._hidden === false) {
-            this.tooltip.animate({
-                left: left,
-                top: top
-            });
-        } else {
-            this.tooltip.css({
-                left: left
-            });
-            this.tooltip.css({
-                top: top
-            });
-        }
-        this.arrow.animate({
-            'left': arrow_left + 'px'
-        });
-        
-        this._hidden = false;
-        this.tooltip.fadeIn('fast');
-        this.text.children().remove();
-        
-        // This should support rich data types, but only text/plain for now
-        // Any HTML within the docstring is escaped by the fixConsole() method.
-        var pre = $('<pre/>').html(utils.fixConsole(content.data['text/plain']));
-        this.text.append(pre);
-        // keep scroll top to be sure to always see the first line
-        this.text.scrollTop(0);
-    };
-
-    return {'Tooltip': Tooltip};
-});
diff --git a/notebook/static/notebook/js/tour.js b/notebook/static/notebook/js/tour.js
deleted file mode 100644
index 5ca26f6ce..000000000
--- a/notebook/static/notebook/js/tour.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define(['jquery', 'bootstraptour', 'base/js/i18n'], function($, Tour, i18n) {
-    "use strict";
-
-    var tour_style = "<div class='popover tour'>\n" +
-        "<div class='arrow'></div>\n" +
-        "<div style='position:absolute; top:7px; right:7px'>\n" +
-            "<button class='btn btn-default btn-sm fa fa-times' data-role='end'></button>\n" +
-        "</div><h3 class='popover-title'></h3>\n" +
-        "<div class='popover-content'></div>\n" +
-        "<div class='popover-navigation'>\n" +
-            "<button class='btn btn-default fa fa-step-backward' data-role='prev'></button>\n" +
-            "<button class='btn btn-default fa fa-step-forward pull-right' data-role='next'></button>\n" +
-            "<button id='tour-pause' class='btn btn-sm btn-default fa fa-pause' data-resume-text='' data-pause-text='' data-role='pause-resume'></button>\n" +
-        "</div>\n" +
-    "</div>";
-
-    var NotebookTour = function (notebook, events) {
-        var that = this;
-        this.notebook = notebook;
-        this.step_duration = 0;
-        this.events = events;
-        this.tour_steps = [
-            { 
-                title: i18n.msg._("Welcome to the Notebook Tour"),
-                placement: 'bottom',
-                orphan: true,
-                content: i18n.msg._("You can use the left and right arrow keys to go backwards and forwards.")
-            }, {
-                element: "#notebook_name",
-                title: i18n.msg._("Filename"),
-                placement: 'bottom',
-                content: i18n.msg._("Click here to change the filename for this notebook.")
-            }, {
-                element: $("#menus").parent(),
-                placement: 'bottom',
-                title: i18n.msg._("Notebook Menubar"),
-                content: i18n.msg._("The menubar has menus for actions on the notebook, its cells, and the kernel it communicates with.")
-            }, {
-                element: "#maintoolbar",
-                placement: 'bottom',
-                title: i18n.msg._("Notebook Toolbar"),
-                content: i18n.msg._("The toolbar has buttons for the most common actions. Hover your mouse over each button for more information.")
-            }, {
-                element: "#modal_indicator",
-                title: i18n.msg._("Mode Indicator"),
-                placement: 'bottom',
-                content: i18n.msg._("The Notebook has two modes: Edit Mode and Command Mode. In this area, an indicator can appear to tell you which mode you are in."),
-                onShow: function(tour) { that.command_icon_hack(); }
-            }, {
-                element: "#modal_indicator",
-                title: i18n.msg._("Command Mode"),
-                placement: 'bottom',
-                onShow: function(tour) { notebook.command_mode(); that.command_icon_hack(); },
-                onNext: function(tour) { that.edit_mode(); },
-                content: i18n.msg._("Right now you are in Command Mode, and many keyboard shortcuts are available. In this mode, no icon is displayed in the indicator area.")
-            }, {
-                element: "#modal_indicator",
-                title: i18n.msg._("Edit Mode"),
-                placement: 'bottom',
-                onShow: function(tour) { that.edit_mode(); },
-                content: i18n.msg._("Pressing <code>Enter</code> or clicking in the input text area of the cell switches to Edit Mode.")
-            }, {
-                element: '.selected',
-                title: i18n.msg._("Edit Mode"),
-                placement: 'bottom',
-                onShow: function(tour) { that.edit_mode(); },
-                content: i18n.msg._("Notice that the border around the currently active cell changed color. Typing will insert text into the currently active cell.")
-            }, {
-                element: '.selected',
-                title: i18n.msg._("Back to Command Mode"),
-                placement: 'bottom',
-                onShow: function(tour) { notebook.command_mode(); },
-                content: i18n.msg._("Pressing <code>Esc</code> or clicking outside of the input text area takes you back to Command Mode.")
-            }, {
-                element: '#keyboard_shortcuts',
-                title: i18n.msg._("Keyboard Shortcuts"),
-                placement: 'bottom',
-                onShow: function(tour) {
-                    /** need to add `open` and `pulse` classes in 2 calls */
-                    $('#help_menu').parent().addClass('open');
-                    $('#help_menu').parent().addClass('pulse');
-                    $('#keyboard_shortcuts').addClass('pulse');
-                  },
-                onHide: function(tour) { 
-                    $('#help_menu').parent().removeClass('open pulse');
-                    $('#keyboard_shortcuts').removeClass('pulse');
-                  },
-                content: i18n.msg._("You can click here to get a list of all of the keyboard shortcuts.")
-            }, {
-                element: "#kernel_indicator_icon",
-                title: i18n.msg._("Kernel Indicator"),
-                placement: 'bottom',
-                onShow: function(tour) { events.trigger('kernel_idle.Kernel');},
-                content: i18n.msg._("This is the Kernel indicator. It looks like this when the Kernel is idle.")
-            }, {
-                element: "#kernel_indicator_icon",
-                title: i18n.msg._("Kernel Indicator"),
-                placement: 'bottom',
-                onShow: function(tour) { events.trigger('kernel_busy.Kernel'); },
-                content: i18n.msg._("The Kernel indicator looks like this when the Kernel is busy.")
-            }, {
-                element: ".fa-stop",
-                placement: 'bottom',
-                title: i18n.msg._("Interrupting the Kernel"),
-                onHide: function(tour) { events.trigger('kernel_idle.Kernel'); },
-                content: i18n.msg._("To cancel a computation in progress, you can click here.")
-            }, {
-                element: "#notification_kernel",
-                placement: 'bottom',
-                onShow: function(tour) { $('.fa-stop').click(); },
-                title: i18n.msg._("Notification Area"),
-                content: i18n.msg._("Messages in response to user actions (Save, Interrupt, etc.) appear here.")
-            }, {
-                title: i18n.msg._("End of Tour"),
-                placement: 'bottom',
-                orphan: true,
-                content: i18n.msg._("This concludes the Jupyter Notebook User Interface Tour.")
-            }
-        ];
-
-        this.tour = new Tour({
-            storage: false, // start tour from beginning every time
-            debug: true,
-            reflex: true, // click on element to continue tour
-            animation: false,
-            duration: this.step_duration,
-            onStart: function() { console.log('tour started'); },
-            // TODO: remove the onPause/onResume logic once pi's patch has been
-            // merged upstream to make this work via data-resume-class and 
-            // data-resume-text attributes.
-            onPause: this.toggle_pause_play,
-            onResume: this.toggle_pause_play,
-            steps: this.tour_steps,
-            template: tour_style,
-            orphan: true
-        });
-        
-    };
-
-    NotebookTour.prototype.start = function () {
-        console.log("let's start the tour");
-        this.tour.init();
-        this.tour.start();
-        if (this.tour.ended())
-        {
-            this.tour.restart();
-        }
-    };
-
-    NotebookTour.prototype.command_icon_hack =  function() {
-        $('#modal_indicator').css('min-height', '18px');
-    };
-    
-    NotebookTour.prototype.toggle_pause_play = function () { 
-        $('#tour-pause').toggleClass('fa-pause fa-play'); 
-    };
-    
-    NotebookTour.prototype.edit_mode = function() { 
-        this.notebook.focus_cell(); 
-        this.notebook.edit_mode();
-    };
-
-    return {'Tour': NotebookTour};
-
-});
-
diff --git a/notebook/static/notebook/less/ansicolors.less b/notebook/static/notebook/less/ansicolors.less
deleted file mode 100644
index 95cf8f3cb..000000000
--- a/notebook/static/notebook/less/ansicolors.less
+++ /dev/null
@@ -1,27 +0,0 @@
-/* CSS font colors for translated ANSI escape sequences */
-
-.ansicolors(@name, @normal, @intense) {
-  .ansi-@{name}-fg { color: @normal; }
-  .ansi-@{name}-bg { background-color: @normal; }
-  .ansi-@{name}-intense-fg { color: @intense; }
-  .ansi-@{name}-intense-bg { background-color: @intense; }
-}
-
-/* The color values are a mix of
-   http://www.xcolors.net/dl/baskerville-ivorylight and
-   http://www.xcolors.net/dl/euphrasia */
-
-.ansicolors(black, #3E424D, #282C36);
-.ansicolors(red, #E75C58, #B22B31);
-.ansicolors(green, #00A250, #007427);
-.ansicolors(yellow, #DDB62B, #B27D12);
-.ansicolors(blue, #208FFB, #0065CA);
-.ansicolors(magenta, #D160C4, #A03196);
-.ansicolors(cyan, #60C6C8, #258F8F);
-.ansicolors(white, #C5C1B4, #A1A6B2);
-
-.ansi-default-inverse-fg { color: #FFFFFF; }
-.ansi-default-inverse-bg { background-color: #000000; }
-
-.ansi-bold { font-weight: bold; }
-.ansi-underline { text-decoration: underline; }
diff --git a/notebook/static/notebook/less/cell.less b/notebook/static/notebook/less/cell.less
deleted file mode 100644
index 0c36a8257..000000000
--- a/notebook/static/notebook/less/cell.less
+++ /dev/null
@@ -1,162 +0,0 @@
-@_cell_padding_minus_border: @cell_padding - @cell_border_width;
-
-._selected_style(@border_color) {
-    position: absolute;
-    display: block;
-    top: -1 * @cell_border_width;
-    left: -1 * @cell_border_width;
-    width: @cell_left_border_width;
-    // height: 100% + (2 * @cell_border_width);
-    height: calc(~"100% + "(2 * @cell_border_width));
-    content: '';
-    background: @border_color;
-}
-
-
-div.cell {
-    .vbox();
-    .corner-all();
-    .border-box-sizing();
-    
-    border-width: @cell_border_width;
-    border-style: solid;
-    border-color: transparent;
-
-    width: 100%;
-    padding: @_cell_padding_minus_border;
-    /* This acts as a spacer between cells, that is outside the border */
-    margin: 0px;
-    outline: none;
-    
-    position: relative;
-    overflow: visible;
-
-    &:before {
-        ._selected_style(transparent);
-    }
-
-    &.jupyter-soft-selected {
-        border-left-color: @soft_select_color;
-        border-left-width: @cell_border_width;
-        padding-left: @cell_padding - @cell_border_width;
-        border-right-color: @soft_select_color;
-        border-right-width: @cell_border_width;
-        background: @soft_select_color;
-    
-        @media print {
-            border-color: transparent;
-        }
-    }
-
-    &.selected, &.selected.jupyter-soft-selected {
-        border-color: @border_color;
-        
-        &:before {
-            ._selected_style(@selected_border_color);
-        }
-
-        @media print {
-            border-color: transparent;
-        }
-    }
-
-    .edit_mode &.selected {
-        border-color: @edit_mode_border_color;
-        
-        &:before {
-            ._selected_style(@edit_mode_border_color);
-        }
-
-        @media print {
-            border-color: transparent;
-        }
-    }
-
-}
-
-
-.prompt {
-    /* This needs to be wide enough for 3 digit prompt numbers: In[100]: */
-    min-width: 14ex;
-
-    /* This padding is tuned to match the padding on the CodeMirror editor. */
-    padding: @code_padding;
-    margin: 0px;
-    font-family: @font-family-monospace;
-    text-align: right;
-
-    /* This has to match that of the the CodeMirror class line-height below */
-    line-height: @code_line_height;
-
-    /* Don't highlight prompt number selection */
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-
-    /* Use default cursor */
-    cursor: default;
-}
-
-@media (max-width: @screen-xs-min) {
-    // prompts are in the main column on small screens,
-    // so text should be left-aligned
-    .prompt {
-        text-align: left;
-    }
-}
-
-div.inner_cell {
-    min-width: 0;
-    .vbox();
-    .box-flex1();
-}
-
-/* input_area and input_prompt must match in top border and margin for alignment */
-div.input_area {
-    border: 1px solid @light_border_color;
-    .corner-all;
-    background: @cell_background;
-    line-height: @code_line_height;
-}
-
-/* This is needed so that empty prompt areas can collapse to zero height when there
-   is no content in the output_subarea and the prompt. The main purpose of this is
-   to make sure that empty JavaScript output_subareas have no height. */
-div.prompt:empty {
-    padding-top: 0;
-    padding-bottom: 0;
-}
-
-div.unrecognized_cell {
-    // from text_cell
-    padding: 5px @_cell_padding_minus_border 5px 0px;
-    .hbox();
-
-    .inner_cell {
-        .border-radius(@border-radius-base);
-        padding: @_cell_padding_minus_border;
-        font-weight: bold;
-        color: red;
-        border: @cell_border_width solid @light_border_color;
-        background: darken(@cell_background, 5%);
-        // remove decoration from link
-        a {
-            color: inherit;
-            text-decoration: none;
-
-            &:hover {
-                color: inherit;
-                text-decoration: none;
-            }
-        }
-    }
-}
-@media (max-width: @screen-xs-min) {
-    // remove prompt indentation on small screens
-    div.unrecognized_cell > div.prompt {
-        display: none;
-    }
-}
diff --git a/notebook/static/notebook/less/celltoolbar.less b/notebook/static/notebook/less/celltoolbar.less
deleted file mode 100644
index 2f77f428d..000000000
--- a/notebook/static/notebook/less/celltoolbar.less
+++ /dev/null
@@ -1,70 +0,0 @@
-/* CSS for the cell toolbar */
-@celltoolbar-height: 29px;
-
-.celltoolbar {
-    border: thin solid #CFCFCF;
-    border-bottom: none;
-    background : #EEE;
-    border-radius : @border-radius-base @border-radius-base 0px 0px;
-    width:100%;
-    -webkit-box-pack: end;
-    height: @celltoolbar-height;
-    padding-right: 4px;
-    .hbox();
-    .end();
-    // safari fix, we cannot use -webkit-flex on hbox
-    // and vbox either or all css get borked
-    // cf https://github.com/jupyter/nbgrader/issues/394
-    display: -webkit-flex;
-    @media print{
-        display: none;
-    }
-}
-
-
-.ctb_hideshow {
-    display:none;
-    vertical-align:bottom;
-}
-
-/* ctb_show is added to the ctb_hideshow div to show the cell toolbar.
-   Cell toolbars are only shown when the ctb_global_show class is also set.
-*/
-.ctb_global_show .ctb_show.ctb_hideshow {
-    display: block;
-}
-
-.ctb_global_show .ctb_show + .input_area,
-.ctb_global_show .ctb_show + div.text_cell_input,
-.ctb_global_show .ctb_show ~ div.text_cell_render {
-    border-top-right-radius: 0px;
-    border-top-left-radius: 0px;
-}
-
-.ctb_global_show .ctb_show ~ div.text_cell_render {
-    // add border to rendered markdown cells
-    border: @border_width solid @light_border_color;
-}
-
-.celltoolbar {
-    font-size: 87%;
-    padding-top: 3px;
-}
-
-.celltoolbar select {
-    .form-control();
-    .input-sm();
-    // undo some of the sizing caused by the above mixins
-    width: inherit;
-    font-size: inherit;
-    height: 22px;
-    padding: 0px;
-    
-    display: inline-block;
-
-}
-
-.celltoolbar label {
-    margin-left: 5px;
-    margin-right: 5px;
-}
diff --git a/notebook/static/notebook/less/codecell.less b/notebook/static/notebook/less/codecell.less
deleted file mode 100644
index 3ca16b158..000000000
--- a/notebook/static/notebook/less/codecell.less
+++ /dev/null
@@ -1,77 +0,0 @@
-div.code_cell {
-    /* avoid page breaking on code cells when printing */
-    @media print {
-        page-break-inside: avoid;
-    }
-}
-
-/* any special styling for code cells that are currently running goes here */
-div.code_cell.running {
-}
-
-div.input {
-    page-break-inside: avoid;
-    .hbox();
-}
-
-@media (max-width: @screen-xs-min) {
-    // move prompts above code on small screens
-    div.input {
-        .vbox();
-    }
-}
-
-div.prompt_container {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: flex-start;
-    text-align: right;
-}
-
-/* input_area and input_prompt must match in top border and margin for alignment */
-div.input_prompt {
-    color: @input_prompt_color;
-    border-top: 1px solid transparent;
-}
-
-div.run_this_cell {
-    display: none;
-    cursor: pointer;
-    color: #333;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 2ex;
-    padding-right: 2ex;
-    width: 1ex;
-}
-
-// set the prompt width
-div.prompt {
-    min-width: 15ex;
-}
-
-@media (-moz-touch-enabled: 1), (any-pointer: coarse) {
-    div.run_this_cell {
-        display: block;
-    }
-}
-
-// The styles related to div.highlight are for nbconvert HTML output only. This works
-// because the .highlight div isn't present in the live notebook. We could put this into
-// nbconvert, but it easily falls out of sync, can't use our less variables and doesn't
-// help the basic template when paired with our CSS.
-
-div.input_area > div.highlight {
-    margin: @code_padding;
-    border: none;
-    padding: 0px;
-    background-color: transparent;
-}
-
-div.input_area > div.highlight > pre {
-    margin: 0px;
-    border: none;
-    padding: 0px;
-    background-color: transparent;
-}
diff --git a/notebook/static/notebook/less/codemirror.less b/notebook/static/notebook/less/codemirror.less
deleted file mode 100644
index c99bc7484..000000000
--- a/notebook/static/notebook/less/codemirror.less
+++ /dev/null
@@ -1,71 +0,0 @@
-/* The following gets added to the <head> if it is detected that the user has a
- * monospace font with inconsistent normal/bold/italic height.  See
- * notebookmain.js.  Such fonts will have keywords vertically offset with
- * respect to the rest of the text.  The user should select a better font.
- * See: https://github.com/ipython/ipython/issues/1503
- *
- * .CodeMirror span {
- *      vertical-align: bottom;
- * }
- */
-
-.CodeMirror {
-    line-height: @code_line_height;  /* Changed from 1em to our global default */
-    font-size: @notebook_font_size;
-    height: auto;     /* Changed to auto to autogrow */
-    background: none;  /* Changed from white to allow our bg to show through */
-}
-
-.CodeMirror-scroll {
-    /*  The CodeMirror docs are a bit fuzzy on if overflow-y should be hidden or visible.*/
-    /*  We have found that if it is visible, vertical scrollbars appear with font size changes.*/
-    overflow-y: hidden;
-    overflow-x: auto;
-}
-
-.CodeMirror-lines {
-    /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */
-    /* we have set a different line-height and want this to scale with that. */
-    /* Note that this should set vertical padding only, since CodeMirror assumes
-       that horizontal padding will be set on CodeMirror pre */
-    padding: @code_padding 0;
-}
-
-.CodeMirror-linenumber {
-    // This is needed to fine tune the position of the line numbers because we use the 0.4em in @code_padding
-    // spacing in various places. Fine tuned to look right.
-    padding: 0 8px 0 4px;
-}
-
-.CodeMirror-gutters {
-    // This is needed because our cell has rounded corners, otherwise the gutter area square
-    // corner cuts into the rounded cell border.
-    border-bottom-left-radius: @border-radius-base;
-    border-top-left-radius: @border-radius-base;
-}
-
-.CodeMirror pre {
-    /* In CM3 this went to 4px from 0 in CM2. This sets horizontal padding only,
-    use .CodeMirror-lines for vertical */
-    padding: 0 @code_padding;
-    border: 0;
-    .border-radius(0)
-}
-
-.CodeMirror-cursor {
-    border-left: 1.4px solid black;
-}
-
-// When zoomed out 67% and 33% on a screen of 1440 width x 900 height
-@media screen and (min-width: 2138px) and (max-width: 4319px)  {
-    .CodeMirror-cursor {
-        border-left: 2px solid black;
-    }
-}
-
-// When zoomed out less than 33%
-@media screen and (min-width: 4320px)  {
-    .CodeMirror-cursor {
-        border-left: 4px solid black;
-    }
-}
diff --git a/notebook/static/notebook/less/commandpalette.less b/notebook/static/notebook/less/commandpalette.less
deleted file mode 100644
index 5ed4b1a90..000000000
--- a/notebook/static/notebook/less/commandpalette.less
+++ /dev/null
@@ -1,69 +0,0 @@
-div.typeahead__container {
-  font: revert;
-}
-
-ul.typeahead__list i {
-    width: 18px;
-}
-
-ul.typeahead__list {
-  max-height: 80vh;
-  overflow:auto;
-
-    & > li > a {
-        /** Firefox bug **/
-        /* see https://github.com/jupyter/notebook/issues/559 */
-        white-space: normal;
-    }
-}
-
-ul.typeahead__list & > li > a.pull-right {
-    .pull-left();
-}
-
-[dir="rtl"] .typeahead__list {
-    text-align : right;
-}
-
-.cmd-palette {
-  & .modal-body{
-    padding: 7px;
-  }
-  
-  & form {
-    background: white;
-  }
-  
-  & input {
-    outline:none;
-  }
-}
-
-.no-shortcut{
-    min-width: 20px;
-    color: transparent;
-}
-
-[dir="rtl"] .no-shortcut.pull-right{
-    .pull-left();
-}
-
-[dir="rtl"] .command-shortcut.pull-right{
-    .pull-left();
-}
-
-.command-shortcut:before{
-    content:"(command mode)";
-    padding-right:3px;
-    color:@gray-light;
-}
-
-.edit-shortcut:before{
-    content:"(edit)";
-    padding-right:3px;
-    color:@gray-light;
-}
-
-[dir="rtl"] .edit-shortcut.pull-right {
-    .pull-left();
-}
diff --git a/notebook/static/notebook/less/completer.less b/notebook/static/notebook/less/completer.less
deleted file mode 100644
index cc8f60550..000000000
--- a/notebook/static/notebook/less/completer.less
+++ /dev/null
@@ -1,26 +0,0 @@
-.completions {
-    position: absolute;
-    z-index: 110;
-    overflow: hidden;
-    border: 1px solid @border_color;
-    .corner-all;
-    .box-shadow(0px 6px 10px -1px #adadad);
-    line-height: 1;
-}
-
-.completions select {
-    background: white;
-    outline: none;
-    border: none;
-    padding: 0px;
-    margin: 0px;
-    overflow: auto;
-    font-family: @font-family-monospace;
-    font-size: 110%;
-    color: @text-color;
-    width: auto;
-}
-
-.completions select option.context {
-    color: darken(@brand-primary, 10%);
-}
diff --git a/notebook/static/notebook/less/highlight-refs.less b/notebook/static/notebook/less/highlight-refs.less
deleted file mode 100644
index a2c0ab68a..000000000
--- a/notebook/static/notebook/less/highlight-refs.less
+++ /dev/null
@@ -1,5 +0,0 @@
-/* load the codemirror defaults as LESS so that highlight.less
-   can load default theme declarations by reference without pulling in the 
-   nasty positioning
-*/
-@import (less) "../../components/codemirror/lib/codemirror.css";
diff --git a/notebook/static/notebook/less/highlight.less b/notebook/static/notebook/less/highlight.less
deleted file mode 100644
index 125b8ac4a..000000000
--- a/notebook/static/notebook/less/highlight.less
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-
-Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org>
-Adapted from GitHub theme
-
-*/
-
-@import (reference) "highlight-refs.less";
-
-@highlight-base: #000;
-
-.highlight-base{
-  color: @highlight-base;
-}
-
-.highlight-variable{
-  .highlight-base();
-}
-
-.highlight-variable-2{
-  color: lighten(@highlight-base, 10%);
-}
-
-.highlight-variable-3{
-  color: lighten(@highlight-base, 20%);
-}
-
-.highlight-string{
-  color: #BA2121;
-}
-
-//fix issue #4206, overwrite .highlight-comment class, from #408080 to #007979
-.highlight-comment{
-  color: #007979;
-  font-style: italic;
-}
-
-.highlight-number{
-  color: #080;
-}
-
-.highlight-atom{
-  color: #88F;
-}
-
-.highlight-keyword{
-  color: #008000;
-  font-weight: bold;
-}
-
-.highlight-builtin{
-  color: #008000;
-}
-
-.highlight-error{
-  color: #f00;
-}
-
-.highlight-operator{
-  color: #AA22FF;
-  font-weight: bold;
-}
-
-.highlight-meta{
-  color: #AA22FF;
-}
-
-/* previously not defined, copying from default codemirror */
-.highlight-def{ .cm-s-default.cm-def() }
-.highlight-punctuation{ .cm-s-default.cm-punctuation() }
-.highlight-property{ .cm-s-default.cm-property() }
-.highlight-string-2{ .cm-s-default.cm-string-2() }
-.highlight-qualifier{ .cm-s-default.cm-qualifier() }
-.highlight-bracket{ .cm-s-default.cm-bracket() }
-.highlight-tag{ .cm-s-default.cm-tag() }
-.highlight-attribute{ .cm-s-default.cm-attribute() }
-.highlight-header{ .cm-s-default.cm-header() }
-.highlight-quote{ .cm-s-default.cm-quote() }
-.highlight-link{ .cm-s-default.cm-link() }
-
-
-/* apply the same style to codemirror */
-.cm-s-ipython span {
-  &.cm-keyword      { .highlight-keyword() }
-  &.cm-atom         { .highlight-atom() }
-  &.cm-number       { .highlight-number() }
-  &.cm-def          { .highlight-def() }
-  &.cm-variable     { .highlight-variable() }
-  &.cm-punctuation  { .highlight-punctuation() }
-  &.cm-property     { .highlight-property() }
-  &.cm-operator     { .highlight-operator() }
-  &.cm-variable-2   { .highlight-variable-2() }
-  &.cm-variable-3   { .highlight-variable-3() }
-  &.cm-comment      { .highlight-comment() }
-  &.cm-string       { .highlight-string() }
-  &.cm-string-2     { .highlight-string-2() }
-  &.cm-meta         { .highlight-meta() }
-  &.cm-qualifier    { .highlight-qualifier() }
-  &.cm-builtin      { .highlight-builtin() }
-  &.cm-bracket      { .highlight-bracket() }
-  &.cm-tag          { .highlight-tag() }
-  &.cm-attribute    { .highlight-attribute() }
-  &.cm-header       { .highlight-header() }
-  &.cm-quote        { .highlight-quote() }
-  &.cm-link         { .highlight-link() }
-  &.cm-error        { .highlight-error() }
-
-  &.cm-tab {
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
-    background-position: right;
-    background-repeat: no-repeat;
-  }
-}
diff --git a/notebook/static/notebook/less/kernelselector.less b/notebook/static/notebook/less/kernelselector.less
deleted file mode 100644
index 9dc98d2d4..000000000
--- a/notebook/static/notebook/less/kernelselector.less
+++ /dev/null
@@ -1,12 +0,0 @@
-#kernel_logo_widget {
-    .current_kernel_logo {
-        display: none;
-        .navbar-vertical-align(32px);
-        width: 32px;
-        height: 32px;
-    }
-}
-
-[dir="rtl"] #kernel_logo_widget {
-    .pull-left();
-}
diff --git a/notebook/static/notebook/less/menubar.less b/notebook/static/notebook/less/menubar.less
deleted file mode 100644
index 1f6acbde7..000000000
--- a/notebook/static/notebook/less/menubar.less
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-#menubar {
-
-  .border-box-sizing();
-  margin-top: 1px;
-
-  .navbar {
-    border-top: 1px;
-    border-radius: 0px 0px @border-radius-base @border-radius-base;
-    margin-bottom: 0px;
-  }
-  
-  .navbar-toggle {
-    float: left;
-    padding-top:7px;
-    padding-bottom:7px;
-    border:none;
-  }
-  .navbar-collapse {
-    clear: left;
-  }
-  
-}
-
-[dir="rtl"] #menubar {
-    .navbar-toggle {
-        float: right;
-  }
-}
-
-[dir="rtl"] #menubar {
-    .navbar-collapse {
-        clear: right;
-   }
-    .navbar-nav {
-        float : right;
-    }
-    .nav {
-        padding-right : 0px;
-    }
-     .navbar-nav > li {
-        float: right;
-    }
-    .navbar-right {
-        float : left !important;
-    }
-}
-
-ul.dropdown-menu:focus
-
-[dir="rtl"] ul.dropdown-menu {
-    text-align: right;
-    left : auto;
-}
-
-[dir="rtl"] ul#new-menu.dropdown-menu {
-    right : auto;
-    left: 0;
-}
-.nav-wrapper {
-  border-bottom: 1px solid @navbar-default-border;
-}
-
-i.menu-icon {
-  // add padding to account for float-right
-  padding-top: 4px;
-}
-
-[dir="rtl"] i.menu-icon.pull-right {
-    .pull-left();
-}
-
-ul.dropdown-menu li a.menu-shortcut-container {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: flex-end;
-}
-
-ul#help_menu li a{
-    overflow: hidden;
-    padding-right: 2.2em;
-    i {
-        margin-right: -1.2em;
-    }
-}
-
-[dir="rtl"] ul#help_menu li a{
-    padding-left : 2.2em;
-    i {
-        margin-right: 0;
-        margin-left : -1.2em;
-    }
-    
-    i.pull-right {
-        .pull-left();
-    }
-}
-
-
-
-// Make sub menus work in BS3.
-// Credit: http://www.bootply.com/86684
-.dropdown-submenu {
-    position: relative;
-}
-
-.dropdown-submenu>.dropdown-menu {
-    top: 0;
-    left: 100%;
-    margin-top: -6px;
-    margin-left: -1px;
-}
-
-[dir="rtl"] .dropdown-submenu>.dropdown-menu {
-    right:100%;
-    margin-right: -1px; 
-}
-
-// arrow that indicate presence of submenu
-.dropdown-submenu:hover>.dropdown-menu {
-    display: block;
-}
-
-.dropdown-submenu>a:after {
-    .fa();
-    display: block;
-    content: @fa-var-caret-right;
-    float: right;
-    color: @dropdown-link-color;
-    margin-top: 2px;
-    margin-right: -10px;
-}
-
-[dir="rtl"] .dropdown-submenu>a:after {
-    float: left;
-    content: @fa-var-caret-left;
-    margin-right : 0;
-    margin-left : -10px;
-}
-
-.dropdown-submenu:hover>a:after {
-    color: @dropdown-link-hover-color;
-}
-
-.dropdown-submenu.pull-left {
-    float: none;
-}
-
-.dropdown-submenu.pull-left>.dropdown-menu {
-    left: -100%;
-    margin-left: 10px;
-}
-
-.action {
-    
-}
-
-.kb {
-    color: darkgray;
-    margin-left: 10px;
-    text-transform: capitalize;
-    kbd {
-        white-space: nowrap;
-    }
-}
-
-//end submenu
diff --git a/notebook/static/notebook/less/modal.less b/notebook/static/notebook/less/modal.less
deleted file mode 100644
index 1ecd3afbc..000000000
--- a/notebook/static/notebook/less/modal.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.modal .modal-body {
-  
-  .rename-message {
-    
-  }
-  .move-path {
-    display: flex;
-    flex-direction: row;
-    justify-content: space;
-    align-items: center;
-    
-    .server-root {
-      padding-right: 20px;
-    }
-    .path-input {
-      flex: 1;
-    }
-  }
-}
diff --git a/notebook/static/notebook/less/notebook.less b/notebook/static/notebook/less/notebook.less
deleted file mode 100644
index 64c1486b4..000000000
--- a/notebook/static/notebook/less/notebook.less
+++ /dev/null
@@ -1,128 +0,0 @@
-@media (max-width: @screen-xs-max) {
-    // remove bootstrap-responsive's body padding on small screens
-    .notebook_app {
-        padding-left: 0px;
-        padding-right: 0px;
-    }
-}
-
-#ipython-main-app {
-    .border-box-sizing();
-    height: 100%;
-}
-
-div#notebook_panel {
-    margin: 0px;
-    padding: 0px;
-    .border-box-sizing();
-    height: 100%;
-}
-
-div#notebook {
-    font-size: @notebook_font_size;
-    line-height: @notebook_line_height;
-    overflow-y: hidden;
-    overflow-x: auto;
-    width: 100%;
-    /* This spaces the page away from the edge of the notebook area */
-    padding-top: @page-header-padding;
-    padding-bottom: @page-header-padding;
-    margin: 0px;
-    outline: none;
-    .border-box-sizing();
-    min-height: 100%;
-}
-
-#notebook-container{
-    @media not print{
-        padding: @page-padding;
-        background-color :  @page-color;
-        min-height: @page-min-height;
-        .box-shadow(@global-shadow);
-    }
-    @media print {
-        width: 100%;
-    }
-}
-
-div.ui-widget-content {
-    border: 1px solid @border_color;
-    outline: none;
-}
-
-pre.dialog {
-    background-color: @cell_background;
-    border: 1px solid #ddd;
-    .corner-all;
-    padding: 0.4em;
-    padding-left: 2em;
-}
-
-p.dialog {
-    padding : 0.2em;
-}
-
-/* Word-wrap output correctly.  This is the CSS3 spelling, though Firefox seems
-   to not honor it correctly.  Webkit browsers (Chrome, rekonq, Safari) do.
- */
-pre, code, kbd, samp { white-space: pre-wrap; }
-
-#fonttest {
-    font-family: @font-family-monospace;
-}
-
-p {
-    margin-bottom:0;
-}
-
-.end_space {
-    min-height: 100px;
-    transition: height .2s ease;
-}
-
-.notebook_app > #header {
-    .box-shadow(@global-shadow);
-}
-
-.notebook_app{
-    @media not print {
-        background-color: @page-backdrop-color;
-    }
-}
-
-kbd {
-    border-style: solid;
-    border-width: 1px;
-    box-shadow: none;
-    margin: 2px;
-    padding-left: 2px;
-    padding-right: 2px;
-    padding-top: 1px;
-    padding-bottom: 1px;
-}
-
-.jupyter-keybindings {
-    padding: 1px;
-    line-height: 24px;
-    border-bottom: 1px solid gray;
-}
-
-.jupyter-keybindings input {
-    margin: 0;
-    padding: 0;
-    border: none;
-}
-
-.jupyter-keybindings i {
-    padding: 6px;
-}
-
-.well code {
-    background-color: lighten(@cell_background, 5%);
-    border-color: @border_color;
-    border-width: @border_width;
-    border-style: solid;
-    padding: 2px;
-    padding-top: 1px;
-    padding-bottom: 1px;
-}
diff --git a/notebook/static/notebook/less/notificationarea.less b/notebook/static/notebook/less/notificationarea.less
deleted file mode 100644
index 8e9d6f7f5..000000000
--- a/notebook/static/notebook/less/notificationarea.less
+++ /dev/null
@@ -1,94 +0,0 @@
-#notification_area {
-    .pull-right();
-    z-index: 10;
-}
-
-[dir="rtl"] #notification_area {
-    .pull-left();
-}
-
-.indicator_area {
-    .pull-right();
-    color: @navbar-default-link-color;
-    margin-left: 5px;
-    margin-right: 5px;
-    width: 11px;
-    z-index: 10;
-    text-align: center;
-    width: auto;
-}
-
-[dir="rtl"] .indicator_area {
-    .pull-left();
-}
-
-#kernel_indicator {
-    .indicator_area();
-    
-    border-left: 1px solid;
-    
-    .kernel_indicator_name {
-        padding-left: 5px;
-        padding-right: 5px;
-        // accessibility improvement
-        color: #102930
-    }
-}
-
-[dir="rtl"] #kernel_indicator {
-    .pull-left();
-    border-left: 0;
-    border-right : 1px solid;
-}
-
-#modal_indicator {
-    .pull-right();
-    .indicator_area();
-}
-
-[dir="rtl"] #modal_indicator {
-    .pull-left();
-} 
-
-#readonly-indicator {
-    .pull-right();
-    .indicator_area();
-
-    margin-top: 2px;
-    margin-bottom: 0px;
-    margin-left: 0px;
-    margin-right: 0px;
-
-    // Start out hidden.
-    display: none;
-}
-
-.modal_indicator:before {
-    .fa-fw();
-}
-
-.edit_mode .modal_indicator:before {
-    .icon(@fa-var-pencil);
-}
-
-.command_mode .modal_indicator:before {
-    .icon(' ');
-}
-
-.kernel_idle_icon:before {
-    .icon(@fa-var-circle-o);
-}
-
-.kernel_busy_icon:before {
-    .icon(@fa-var-circle);
-}
-
-.kernel_dead_icon:before {
-    .icon(@fa-var-bomb);
-}
-
-.kernel_disconnected_icon:before {
-    .icon(@fa-var-chain-broken);
-}
-
-
diff --git a/notebook/static/notebook/less/notificationwidget.less b/notebook/static/notebook/less/notificationwidget.less
deleted file mode 100644
index c9c376e0b..000000000
--- a/notebook/static/notebook/less/notificationwidget.less
+++ /dev/null
@@ -1,21 +0,0 @@
-.notification_widget {
-    color: @navbar-default-link-color;
-    z-index: 10;
-    background: @notification_widget_bg;
-    margin-right: 4px;
-    .btn-default();
-}
-
-.notification_widget.warning {
-    .btn-warning();
-}
-.notification_widget.success {
-    .btn-success();
-}
-.notification_widget.info {
-    .btn-info();
-}
-.notification_widget.danger {
-    .btn-danger();
-}
-
diff --git a/notebook/static/notebook/less/outputarea.less b/notebook/static/notebook/less/outputarea.less
deleted file mode 100644
index eb4794aa5..000000000
--- a/notebook/static/notebook/less/outputarea.less
+++ /dev/null
@@ -1,217 +0,0 @@
-div.output_wrapper {
-    /* this position must be relative to enable descendents to be absolute within it */
-    position: relative;
-    .vbox();
-    // avoid scrolled output overlaying input in some strange circumstances
-    z-index: 1;
-}
-
-/* class for the output area when it should be height-limited */
-div.output_scroll {
-    /* ideally, this would be max-height, but FF barfs all over that */
-    height: 24em;
-    /* FF needs this *and the wrapper* to specify full width, or it will shrinkwrap */
-    width: 100%;
-
-    overflow: auto;
-    .corner-all;
-    .box-shadow(inset 0 2px 8px rgba(0, 0, 0, .8));
-    display: block;
-}
-
-/* output div while it is collapsed */
-div.output_collapsed {
-    margin: 0px;
-    padding: 0px;
-    .vbox();
-}
-
-div.out_prompt_overlay {
-    height: 100%;
-    padding: 0px @code_padding;
-    position: absolute;
-    .corner-all;
-}
-
-div.out_prompt_overlay:hover {
-    /* use inner shadow to get border that is computed the same on WebKit/FF */
-    .box-shadow(inset 0 0 1px #000);
-    background: rgba(240, 240, 240, 0.5);
-}
-
-div.output_prompt {
-    color: @output_prompt_color;
-}
-
-/* This class is the outer container of all output sections. */
-div.output_area {
-    padding: 0px;
-    page-break-inside: avoid;
-    .hbox();
-
-    .MathJax_Display {
-        // Inside a CodeCell, elements are left justified
-        text-align: left !important;
-    }
-
-    .rendered_html {
-        // Inside a CodeCell, elements are left justified
-        table {
-            margin-left: 0;
-            margin-right: 0;
-        }
-    
-        img {
-            margin-left: 0;
-            margin-right: 0;
-        }
-    }
-    
-    img, svg {
-        max-width: 100%;
-        height: auto;
-        &.unconfined {
-            max-width: none;
-        }
-    }
-
-    .mglyph>img {
-        max-width: none;
-    }
-}
-
-/* This is needed to protect the pre formating from global settings such
-   as that of bootstrap */
-.output {
-    .vbox();
-}
-
-@media (max-width: @screen-xs-min) {
-    // move prompts above output on small screens
-    div.output_area {
-        .vbox();
-    }
-}
-
-div.output_area pre {
-    margin: 0;
-    padding: 1px 0 1px 0;
-    border: 0;
-    vertical-align: baseline;
-    color: @output_pre_color;
-    background-color: transparent;
-    .border-radius(0);
-}
-
-/* This class is for the output subarea inside the output_area and after
-   the prompt div. */
-div.output_subarea {
-    // Don't let contents overflow page area.
-    overflow-x: auto;
-    padding: @code_padding;
-    .box-flex1();
-    // appears to be needed for max-width in children to mean anything on Firefox:
-    max-width: calc(~"100% - 14ex");
-}
-
-div.output_scroll div.output_subarea {
-    // if the output area is scrolling, we don't need scrollbars on the subarea
-    overflow-x: visible;
-}
-
-/* The rest of the output_* classes are for special styling of the different
-   output types */
-
-/* all text output has this class: */
-div.output_text {
-    text-align: left;
-    color: @text-color;
-    /* This has to match that of the the CodeMirror class line-height below */  
-    line-height: @code_line_height;
-}
-
-/* stdout/stderr are 'text' as well as 'stream', but execute_result/error are *not* streams */
-div.output_stream {
-}
-
-div.output_stdout {
-}
-
-div.output_stderr {
-    background: #fdd; /* very light red background for stderr */
-}
-
-div.output_latex {
-    text-align: left;
-}
-
-div.output_html {
-}
-
-div.output_png {
-}
-
-div.output_jpeg {
-}
-
-/* Empty output_javascript divs should have no height */
-div.output_javascript:empty {
-    padding: 0;
-}
-
-.js-error {
-    color: darkred;
-}
-
-/* raw_input styles */
-
-div.raw_input_container {
-    line-height: @code_line_height;
-    // for some reason, em padding doesn't compute the same for raw_input
-    // that is not the first input, but px does
-    padding-top: 5px;
-}
-
-pre.raw_input_prompt {
-    /* nothing needed here. */
-}
-
-input.raw_input {
-    font-family: @font-family-monospace;
-    font-size: inherit;
-    color: inherit;
-    width: auto;
-    /* make sure input baseline aligns with prompt */
-    vertical-align: baseline;
-    /* padding + margin = 0.5em between prompt and cursor */
-    padding: 0em 0.25em;
-    margin: 0em 0.25em;
-}
-
-input.raw_input:focus {
-    box-shadow: none;
-}
-
-p.p-space {
-    margin-bottom: 10px;
-}
-
-div.output_unrecognized {
-  padding: 5px;
-  font-weight: bold;
-  color: red;
-  // remove decoration from link
-  a {
-      color: inherit;
-      text-decoration: none;
-
-      &:hover {
-          color: inherit;
-          text-decoration: none;
-      }
-  }
-}
-
-div.output_text[dir="rtl"] {
-  text-align: right;
-}
diff --git a/notebook/static/notebook/less/pager.less b/notebook/static/notebook/less/pager.less
deleted file mode 100644
index 9fafe6378..000000000
--- a/notebook/static/notebook/less/pager.less
+++ /dev/null
@@ -1,76 +0,0 @@
-div#pager {
-    background-color:   @body-bg;
-    font-size: @notebook_font_size;
-    line-height: @notebook_line_height;
-    overflow: hidden;
-    display: none;
-    position: fixed;
-    bottom: 0px;
-    width: 100%;
-    max-height: 50%;
-    padding-top: 8px;
-
-    .box-shadow(@global-shadow);
-
-    /* Display over codemirror */
-    z-index: 100;
-
-    /* Hack which prevents jquery ui resizable from changing top. */
-    top: auto !important;
-
-    pre {
-        line-height: @code_line_height;
-        color: @text-color;
-        background-color: @cell_background;
-        padding: @code_padding;
-    }
-
-    #pager-button-area {
-        position: absolute;
-        top: 8px;
-        right: 20px; 
-    }
-
-    #pager-button-area .ui-button{
-        padding-top:0px;
-        padding-bottom:0px;
-        padding-right:10px;
-        padding-left:10px;
-    }
-
-    #pager-contents {
-        position: relative;
-        overflow: auto;
-        width: 100%;
-        height: 100%;
-
-        #pager-container {
-            position: relative;
-            padding: 15px 0px;
-            .border-box-sizing();
-        }
-    }
-
-    .ui-resizable-handle {
-        top: 0px;
-        height: 8px;
-        background: @cell_background;
-        border-top: 1px solid @light_border_color;
-        border-bottom: 1px solid @light_border_color;
-
-        /* This injects handle bars (a short, wide = symbol) for 
-        the resize handle. */
-        &::after {
-            content: '';
-            
-            top: 2px;
-            left: 50%;
-            height: 3px;
-            width: 30px;
-            margin-left: -15px;
-            position: absolute;
-
-            border-top: 1px solid @light_border_color;
-        }
-    }
-}
diff --git a/notebook/static/notebook/less/quickhelp.less b/notebook/static/notebook/less/quickhelp.less
deleted file mode 100644
index 310185cbd..000000000
--- a/notebook/static/notebook/less/quickhelp.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.quickhelp {
-    .hbox();
-    line-height: 1.8em;
-}
-.shortcut_key {
-    display: inline-block;
-    width: 21ex;
-    text-align: right;
-    font-family: @font-family-monospace;
-}
-
-.shortcut_descr {
-    display: inline-block;
-    .box-flex1();
-}
diff --git a/notebook/static/notebook/less/renderedhtml.less b/notebook/static/notebook/less/renderedhtml.less
deleted file mode 100644
index b272f5be6..000000000
--- a/notebook/static/notebook/less/renderedhtml.less
+++ /dev/null
@@ -1,143 +0,0 @@
-.rendered_html {
-
-    color: @text-color;
-    em {font-style: italic;}
-    strong {font-weight: bold;}
-    u {text-decoration: underline;}
-    :link {text-decoration: underline;}
-    :visited {text-decoration: underline;}
-
-    // For a 14px base font size this goes as:
-    // font-size = 26, 22, 18, 14, 12, 12
-    // margin-top = 14, 14, 14, 14, 8, 8
-    h1 {font-size: 185.7%; margin: 1.08em 0 0 0; font-weight: bold; line-height: 1.0;}
-    h2 {font-size: 157.1%; margin: 1.27em 0 0 0; font-weight: bold; line-height: 1.0;}
-    h3 {font-size: 128.6%; margin: 1.55em 0 0 0; font-weight: bold; line-height: 1.0;}
-    h4 {font-size: 100%; margin: 2em 0 0 0; font-weight: bold; line-height: 1.0;}
-    h5 {font-size: 100%; margin: 2em 0 0 0; font-weight: bold; line-height: 1.0; font-style: italic;}
-    h6 {font-size: 100%; margin: 2em 0 0 0; font-weight: bold; line-height: 1.0; font-style: italic;}
-
-    // Reduce the top margins by 14px compared to above
-    h1:first-child {margin-top: 0.538em;}
-    h2:first-child {margin-top: 0.636em;}
-    h3:first-child {margin-top: 0.777em;}
-    h4:first-child {margin-top: 1em;}
-    h5:first-child {margin-top: 1em;}
-    h6:first-child {margin-top: 1em;}
-
-    ul:not(.list-inline),
-    ol:not(.list-inline) {padding-left: 2em;}
-    ul {list-style:disc;}
-    ul ul {
-      list-style:square;
-      margin-top: 0;
-    }
-    ul ul ul {list-style:circle;}
-    ol {list-style:decimal;}
-    ol ol {
-      list-style:upper-alpha; 
-      margin-top: 0;
-    }
-    ol ol ol {list-style:lower-alpha; }
-    ol ol ol ol {list-style:lower-roman; }
-    /* any extras will just be numbers: */
-    ol ol ol ol ol {list-style:decimal;}
-    * + ul {margin-top: 1em;}
-    * + ol {margin-top: 1em;}
-
-    hr {
-        color: @rendered_html_border_color;
-        background-color: @rendered_html_border_color;
-    }
-
-    pre {
-        margin: 1em 2em;
-        padding: 0px;
-        background-color: @body-bg;
-    }
-
-    code {
-        background-color: #eff0f1;
-    }
-
-    p code {
-        padding: 1px 5px;
-    }
-
-    pre code {background-color: @body-bg;}
-
-    pre, code {
-        border: 0;
-        color: @text-color;
-        font-size: 100%;
-    }
-
-    blockquote {margin: 1em 2em;}
-
-    table {
-        margin-left: auto;
-        margin-right: auto;
-        border: none;
-        border-collapse: collapse;
-        border-spacing: 0;
-        color: @rendered_html_border_color;
-        font-size: 12px;
-        table-layout: fixed;
-    }
-    thead {
-        border-bottom: 1px solid @rendered_html_border_color;
-        vertical-align: bottom;
-    }
-    tr, th, td {
-        text-align: right;
-        vertical-align: middle;
-        padding: 0.5em 0.5em;
-        line-height: normal;
-        white-space: normal;
-        max-width: none;
-        border: none;
-    }
-    th {
-        font-weight: bold;
-    }
-    tbody tr:nth-child(odd) {
-        background: #f5f5f5;
-    }
-    tbody tr:hover {
-        background: rgba(66, 165, 245, 0.2);
-    }
-    * + table {margin-top: 1em;}
-
-    p {text-align: left;}
-    * + p {margin-top: 1em;}
-
-    img {
-        display: block;
-        margin-left: auto;
-        margin-right: auto;
-    }
-    * + img {margin-top: 1em;}
-    
-    img, svg {
-        max-width: 100%;
-        height: auto;
-        &.unconfined {
-            max-width: none;
-        }
-    }
-
-    // Override bootstrap settings, see #1390
-    .alert {margin-bottom: initial;}
-    * + .alert {margin-top: 1em;}
-}
-
-// Right align text iff:
-// (a) notebook is rtl and it's not overriden in cell metadata (i.e. rtl or none)
-// (b) notebook is whatever but cell metadata specifies rtl
-// note that cell metadata is used to set 'dir' attribute of rendered_html element.
-[dir="rtl"] .rendered_html:not([dir="ltr"]), .rendered_html[dir="rtl"] {
-    p {
-        text-align : right;
-    }
-}
-
diff --git a/notebook/static/notebook/less/savewidget.less b/notebook/static/notebook/less/savewidget.less
deleted file mode 100644
index 74b9d04bb..000000000
--- a/notebook/static/notebook/less/savewidget.less
+++ /dev/null
@@ -1,62 +0,0 @@
-span.save_widget {
-    height: 30px;
-    margin-top: 4px;
-    display: flex;
-    justify-content: flex-start;
-    align-items: baseline;
-    width: 50%;
-    flex: 1;
-    
-    span.filename {
-        height: 100%;
-        line-height: 1em;
-        margin-left: @padding-large-horizontal;
-        border: none;
-        font-size: 146.5%;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        &:hover{
-            // ensure body is lighter on dark palette, 
-            // and vice versa
-            background-color:contrast(@body-bg, lighten(@body-bg,30%), darken(@body-bg,10%));
-        }
-        .corner-all;
-    }
-}
-
-[dir="rtl"] span.save_widget.pull-left {
-    .pull-right();
-}
-
-[dir="rtl"] span.save_widget {
-    span.filename {
-        margin-left : 0;
-        margin-right : @padding-large-horizontal;
-    }
-}
-
-span.checkpoint_status, span.autosave_status {
-    font-size: small;
-    white-space: nowrap;
-    padding: 0 5px;
-}
-
-@media (max-width: @screen-xs-max) {
-    span.save_widget {
-        font-size: small;
-        padding: 0 0 0 5px;
-    }
-    span.checkpoint_status, span.autosave_status {
-        display: none;
-    }
-}
-
-@media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
-    span.checkpoint_status {
-        display: none;
-    }
-    span.autosave_status {
-        font-size: x-small;
-    }
-}
diff --git a/notebook/static/notebook/less/searchandreplace.less b/notebook/static/notebook/less/searchandreplace.less
deleted file mode 100644
index 53cdf372a..000000000
--- a/notebook/static/notebook/less/searchandreplace.less
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#find-and-replace {
-
-  #replace-preview .match, #replace-preview .insert {
-    background-color: #BBDEFB; // MD Blue 100
-    border-color: #90CAF9; // MD Blue 200
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 0px;
-  }
-
-
-  [dir="ltr"] & .input-group-btn + .form-control {
-    border-left: none;
-  }
-
-  [dir="rtl"] & .input-group-btn + .form-control {
-     border-right: none;
-  }
-
-  #replace-preview .replace {
-    
-    & .match {
-     // text-decoration: line-through;
-      background-color: #FFCDD2; // MD Red 100
-      border-color: #EF9A9A; // MD Red 200
-      border-radius: 0px;
-      
-    }
-    
-    & .insert {
-      background-color: #C8E6C9; // MD Green 100
-      border-color: #A5D6A7; // MD Green 200
-      border-radius: 0px;
-      
-    }
-  }
-
-  #replace-preview {
-    max-height: 60vh;
-    overflow: auto;
-    pre {
-        padding: 5px 10px;
-    }
-  }
-}
diff --git a/notebook/static/notebook/less/style.less b/notebook/static/notebook/less/style.less
deleted file mode 100644
index e02343a82..000000000
--- a/notebook/static/notebook/less/style.less
+++ /dev/null
@@ -1,21 +0,0 @@
-@import "style_noapp.less";
-
-/*!
-*
-* IPython notebook webapp
-*
-*/
-@import "notebook.less";
-@import "celltoolbar.less";
-@import "tagbar.less";
-@import "completer.less";
-@import "kernelselector.less";
-@import "modal.less";
-@import "menubar.less";
-@import "notificationarea.less";
-@import "notificationwidget.less";
-@import "pager.less";
-@import "quickhelp.less";
-@import "savewidget.less";
-@import "toolbar.less";
-@import "tooltip.less";
diff --git a/notebook/static/notebook/less/style_noapp.less b/notebook/static/notebook/less/style_noapp.less
deleted file mode 100644
index f450328aa..000000000
--- a/notebook/static/notebook/less/style_noapp.less
+++ /dev/null
@@ -1,14 +0,0 @@
-/*!
-*
-* IPython notebook
-*
-*/
-@import "variables.less";
-@import "ansicolors.less";
-@import "cell.less";
-@import "codecell.less";
-@import "codemirror.less";
-@import "highlight.less";
-@import "outputarea.less";
-@import "renderedhtml.less";
-@import "textcell.less";
diff --git a/notebook/static/notebook/less/tagbar.less b/notebook/static/notebook/less/tagbar.less
deleted file mode 100644
index bbdaf717c..000000000
--- a/notebook/static/notebook/less/tagbar.less
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-.tags_button_container {
-    width: 100%;
-    display: flex;
-}
-
-.tag-container {
-    display: flex;
-    flex-direction: row;
-    flex-grow: 1;
-    overflow: hidden;
-    position: relative;
-}
-
-.tag-container > * {
-    margin: 0 4px;
-}
-
-.remove-tag-btn {
-    margin-left: 4px;
-}
-
-.tags-input {
-    display: flex;
-}
-
-.cell-tag:last-child:after {
-    content: "";
-    position: absolute;
-    right: 0;
-    width: 40px;
-    height: 100%;
-    /* Fade to background color of cell toolbar */
-    background: linear-gradient(to right, rgba(0,0,0,0), #EEE);
-}
-
-.tags-input > * {
-    margin-left: 4px;
-}
-
-.cell-tag,
-.tags-input input,
-.tags-input button {
-    .form-control();
-    .input-sm();
-    // undo some of the sizing caused by the above mixins
-    box-shadow: none;
-    width: inherit;
-    font-size: inherit;
-    height: 22px;
-    line-height: 22px;
-    padding: 0px 4px;
-
-    display: inline-block;
-}
-
-.cell-tag,
-.tags-input button {
-    padding: 0px 4px;
-}
-
-.cell-tag {
-    background-color: #fff;
-    white-space: nowrap;
-}
-
-.tags-input input[type=text]:focus {
-    outline: none;
-    box-shadow: none;
-    border-color: #ccc;
-}
diff --git a/notebook/static/notebook/less/textcell.less b/notebook/static/notebook/less/textcell.less
deleted file mode 100644
index a683199ce..000000000
--- a/notebook/static/notebook/less/textcell.less
+++ /dev/null
@@ -1,83 +0,0 @@
-div.text_cell {
-    .hbox();
-}
-@media (max-width: @screen-xs-min) {
-    // remove prompt indentation on small screens
-    div.text_cell > div.prompt {
-        display: none;
-    }
-}
-
-div.text_cell_render {
-    /*font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;*/
-    outline: none;
-    resize: none;
-    width:  inherit;
-    border-style: none;
-    padding: 0.5em 0.5em 0.5em @code_padding;
-    color: @text-color;
-    .border-box-sizing();
-}
-
-a.anchor-link:link {
-  text-decoration: none;
-  padding: 0px 20px;
-  visibility: hidden;
-}
-
-h1,h2,h3,h4,h5,h6 {
-    &:hover .anchor-link {
-        visibility: visible;
-    }
-}
-
-.text_cell.rendered .input_area {
-    display: none;
-}
-
-.text_cell.rendered .rendered_html {
-    overflow-x: auto;
-    
-    // Content in the y direction should cause the rendered content to grow,
-    // the overflow-x: auto causes chrome to assume the same of y, so we need
-    // to tell it explicitly otherwise.
-    overflow-y: hidden;
-}
-
-.text_cell.rendered .rendered_html {
-	tr, th, td {
-		max-width: none;
-	}
-}
-
-.text_cell.unrendered .text_cell_render {
-    display:none;
-}
-
-.text_cell .dropzone .input_area {
-  border: 2px dashed #bababa;
-  margin: -1px;
-}
-
-.cm-header-1,
-.cm-header-2,
-.cm-header-3,
-.cm-header-4,
-.cm-header-5,
-.cm-header-6 {
-    font-weight: bold;
-    font-family: @font-family-sans-serif;
-}
-
-.cm-header-1 { font-size: 185.7%; }
-.cm-header-2 { font-size: 157.1%; }
-.cm-header-3 { font-size: 128.6%; }
-.cm-header-4 { font-size: 110%; }
-.cm-header-5 {
-    font-size: 100%;
-    font-style: italic;
-}
-.cm-header-6 {
-    font-size: 100%;
-    font-style: italic;
-}
diff --git a/notebook/static/notebook/less/toolbar.less b/notebook/static/notebook/less/toolbar.less
deleted file mode 100644
index d5e7d5b52..000000000
--- a/notebook/static/notebook/less/toolbar.less
+++ /dev/null
@@ -1,66 +0,0 @@
-.toolbar {
-    padding: 0px;
-    margin-left: -5px;
-    margin-top: 2px;
-    margin-bottom: 5px;
-
-    select, label {
-        width: auto;
-        vertical-align:middle;
-        margin-right:2px;
-        margin-bottom:0px;
-        display: inline;
-        font-size: 92%;
-        margin-left:0.3em;
-        margin-right:0.3em;
-        padding: 0px;
-        padding-top: 3px;
-    }
-    .btn {
-        padding: 2px 8px;
-    }
-
-    .border-box-sizing();
-}
-
-.toolbar .btn-group {
-  margin-top: 0px;
-  margin-left: 5px;
-}
-
-.toolbar-btn-label {
-  margin-left: 6px;
-}
-
-#maintoolbar {
-  margin-bottom: -3px;
-  margin-top: -8px;
-  border: 0px;
-  min-height: 27px;
-  margin-left: 0px;
-  padding-top: 11px;
-  padding-bottom: 3px;
-
-  .navbar-text {
-    float: none;
-    vertical-align: middle;
-    text-align: right;
-    margin-left: 5px;
-    margin-right: 0px;
-    margin-top: 0px;
-  }
-}
-
-.select-xs {
-  height: @btn_small_height;
-}
-
-[dir="rtl"] .btn-group > .btn, .btn-group-vertical > .btn {
-    float: right;
-}
-
-// highlight the new menu where celltoolbar is
-.pulse, .dropdown-menu > li > a.pulse,  li.pulse > a.dropdown-toggle, li.pulse.open > a.dropdown-toggle {
-    background-color: #F37626;
-    color: white;
-}
diff --git a/notebook/static/notebook/less/tooltip.less b/notebook/static/notebook/less/tooltip.less
deleted file mode 100644
index 37a340a42..000000000
--- a/notebook/static/notebook/less/tooltip.less
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Primary styles
- *
- * Author: Jupyter Development Team
- */
-
-/** WARNING IF YOU ARE EDITTING THIS FILE, if this is a .css file, It has a lot
- * of chance of beeing generated from the ../less/[samename].less file, you can
- * try to get back the less file by reverting somme commit in history
- **/
-
-/*
- * We'll try to get something pretty, so we
- * have some strange css to have the scroll bar on
- * the left with fix button on the top right of the tooltip
- */
-
-// double slash comment are remove by less compilation
-// **
-// * Less mixins
-// **/
-
-// Four color of the background
-@import "variables" ;
-
-.dropshadow(){
- -moz-box-shadow:    0px 6px 10px -1px #adadad;
-  -webkit-box-shadow: 0px 6px 10px -1px #adadad;
-  box-shadow:         0px 6px 10px -1px #adadad;
-}
-
-// smoth height adaptation
-.smoothheight(@t:500ms) {
-    -webkit-transition-property: height;
-    -webkit-transition-duration: @t;
-    -moz-transition-property: height;
-    -moz-transition-duration: @t;
-    transition-property: height;
-    transition-duration: @t;
-}
-
-@-moz-keyframes fadeOut {
-    from {opacity:1;}
-    to {opacity:0;}
-}
-
-@-webkit-keyframes fadeOut {
-    from {opacity:1;}
-    to {opacity:0;}
-}
-
-@-moz-keyframes fadeIn {
-    from {opacity:0;}
-    to {opacity:1;}
-}
-
-@-webkit-keyframes fadeIn {
-    from {opacity:0;}
-    to {opacity:1;}
-}
-
-/*properties of tooltip after "expand"*/
-.bigtooltip {
-    overflow: auto;
-    height: 200px;
-    .smoothheight();
-}
-
-/*properties of tooltip before "expand"*/
-.smalltooltip{
-    .smoothheight();
-    text-overflow: ellipsis;
-    overflow: hidden;
-    height:85px;
-}
-
-.tooltipbuttons
-{
-    position: absolute;
-    padding-right : 15px;
-    top : 0px;
-    right:0px;
-}
-
-.tooltipbuttons .ui-button{
-    padding-top:0px;
-    padding-bottom:0px;
-    padding-right:10px;
-    padding-left:10px;
-}
-
-.tooltiptext
-{
-    /*avoid the button to overlap on some docstring*/
-    padding-right:30px;
-     /*avoid the ui-icon(s) from overlapping the tooltip*/
-     padding-top:5px;
-}
-
-.ipython_tooltip {
-    max-width:700px;
-    /*fade-in animation when inserted*/
-    -webkit-animation: fadeOut 400ms;
-    -moz-animation: fadeOut 400ms;
-    animation: fadeOut 400ms;
-    -webkit-animation: fadeIn 400ms;
-    -moz-animation: fadeIn 400ms;
-    animation: fadeIn 400ms;
-    vertical-align: middle;
-    background-color: @cell_background;
-
-    overflow : visible;
-    border: @border_color @border_width solid;
-    outline: none;
-    padding: 3px;
-    margin: 0px;
-    padding-left:7px;
-    font-family: @font-family-monospace;
-    min-height:50px;
-
-    .dropshadow;
-    .corner-all;
-
-    a {
-        float:right;
-    };
-    position: absolute;
-
-	z-index: 1000;
-	
-	.tooltiptext {
-		pre {
-			border: 0;
-			.border-radius(0);
-			font-size: 100%;
-			background-color: @cell_background;
-		}
-	}
-}
-
-.pretooltiparrow {
-  left: 0px;
-  margin: 0px;
-  top: -16px;
-  width: 40px;
-  height: 16px;
-  overflow: hidden;
-  position: absolute;
-
-}
-
-.pretooltiparrow:before {
-  background-color : @cell_background;
-  border : @border_width @border_color solid;
-  z-index:11;
-  content: "";
-  position: absolute;
-  left: 15px;
-  top: 10px;
-  width: 25px;
-  height: 25px;
-  @theta : 45deg;
-  -webkit-transform: rotate(@theta);
-  -moz-transform:    rotate(@theta);
-  -ms-transform:     rotate(@theta);
-  -o-transform:      rotate(@theta);
-}
diff --git a/notebook/static/notebook/less/variables.less b/notebook/static/notebook/less/variables.less
deleted file mode 100644
index 2ceb22468..000000000
--- a/notebook/static/notebook/less/variables.less
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// Our own variables for this page
-
-@cell_selected_background:      darken(@body-bg, 2%);
-@cell_background:               darken(@body-bg, 3.2%);
-@border_color:                  darken(@cell_selected_background, 31%);
-@light_border_color:            darken(@cell_selected_background, 17%);
-@border_width:                  1px;
-@notebook_font_size:            14px;
-@notebook_line_height:          20px;
-@code_line_height:              1.21429em;  // changed from 1.231 to get 17px even
-@code_padding:                  0.4em;  // 5.6 px
-@rendered_html_border_color:    black;
-@input_prompt_color:            #303F9F;
-@output_prompt_color:           #D84315;
-@output_pre_color:              black;
-@notification_widget_bg:        rgba(240, 240, 240, 0.5);
-
-
-@selected_border_color:         #42A5F5;
-@selected_border_color_light:   #90CAF9;
-@soft_select_color:             #E3F2FD;
-
-
-@edit_mode_border_color:        #66BB6A;
-@cell_padding:                  6px;
-@cell_border_width:             1px;
-@cell_left_border_width:        5px;
-
-@navbar-default-link-color:       darken(#777, 13%);
diff --git a/notebook/static/robots.txt b/notebook/static/robots.txt
deleted file mode 100644
index 9662fc465..000000000
--- a/notebook/static/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: / 
diff --git a/notebook/static/services/config.js b/notebook/static/services/config.js
deleted file mode 100644
index 822306d9f..000000000
--- a/notebook/static/services/config.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'base/js/utils',
-    ],
-function(utils) {
-    "use strict";
-    var ConfigSection = function(section_name, options) {
-        this.section_name = section_name;
-        this.base_url = options.base_url;
-        this.data = {};
-        
-        var that = this;
-        
-        /* .loaded is a promise, fulfilled the first time the config is loaded
-         * from the server. Code can do:
-         *      conf.loaded.then(function() { ... using conf.data ... });
-         */
-        this._one_load_finished = false;
-        this.loaded = new Promise(function(resolve, reject) {
-            that._finish_firstload = resolve;
-        });
-    };
-
-    ConfigSection.prototype.api_url = function() {
-        return utils.url_path_join(this.base_url, 'api/config',
-            utils.encode_uri_components(this.section_name));
-    };
-    
-    ConfigSection.prototype._load_done = function() {
-        if (!this._one_load_finished) {
-            this._one_load_finished = true;
-            this._finish_firstload();
-        }
-    };
-    
-    ConfigSection.prototype.load = function() {
-        var that = this;
-        return utils.promising_ajax(this.api_url(), {
-            cache: false,
-            type: "GET",
-            dataType: "json",
-        }).then(function(data) {
-            that.data = data;
-            that._load_done();
-            return data;
-        });
-    };
-    
-    /**
-     * Modify the config values stored. Update the local data immediately,
-     * send the change to the server, and use the updated data from the server
-     * when the reply comes.
-     */
-    ConfigSection.prototype.update = function(newdata) {
-        $.extend(true, this.data, newdata);  // true -> recursive update
-        
-        var that = this;
-        return utils.promising_ajax(this.api_url(), {
-            processData: false,
-            type : "PATCH",
-            data: JSON.stringify(newdata),
-            dataType : "json",
-            contentType: 'application/json',
-        }).then(function(data) {
-            that.data = data;
-            that._load_done();
-            return data;
-        });
-    };
-    
-    
-    var ConfigWithDefaults = function(section, defaults, classname) {
-        this.section = section;
-        this.defaults = defaults;
-        this.classname = classname;
-    };
-    
-    ConfigWithDefaults.prototype._class_data = function() {
-        if (this.classname) {
-            return this.section.data[this.classname] || {};
-        } else {
-            return this.section.data;
-        }
-    };
-    
-    /**
-     * Wait for config to have loaded, then get a value or the default.
-     * Returns a promise.
-     */
-    ConfigWithDefaults.prototype.get = function(key) {
-        var that = this;
-        return this.section.loaded.then(function() {
-            return that.get_sync(key);
-        });
-    };
-    
-    /**
-     * Return a config value. If config is not yet loaded, return the default
-     * instead of waiting for it to load.
-     */
-    ConfigWithDefaults.prototype.get_sync = function(key) {
-        var data = this._class_data();
-        if (key === undefined) {
-            // no key specified, return full config data
-            return $.extend(true, {}, this.defaults, data);
-        }
-
-        var value = data[key];
-        if (value !== undefined) {
-            if (typeof value == 'object') {
-                // merge with defaults if it's an object
-                return $.extend(true, {}, this.defaults[key], value);
-            } else {
-                return value;
-            }
-        }
-        return this.defaults[key];
-    };
-    
-    /**
-     * Set a config value. Send the update to the server, and change our
-     * local copy of the data immediately.
-     * Returns a promise which is fulfilled when the server replies to the
-     * change.
-     */
-     ConfigWithDefaults.prototype.set = function(key, value) {
-         var d = {};
-         d[key] = value;
-         if (this.classname) {
-            var d2 = {};
-            d2[this.classname] = d;
-            return this.section.update(d2);
-        } else {
-            return this.section.update(d);
-        }
-    };
-    
-    return {ConfigSection: ConfigSection,
-            ConfigWithDefaults: ConfigWithDefaults,
-           };
-
-});
diff --git a/notebook/static/services/contents.js b/notebook/static/services/contents.js
deleted file mode 100644
index 0425959b3..000000000
--- a/notebook/static/services/contents.js
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define(function(requirejs) {
-    "use strict";
-
-    var $ = requirejs('jquery');
-    var utils = requirejs('base/js/utils');
-
-    var Contents = function(options) {
-        /**
-         * Constructor
-         *
-         * Preliminary documentation for the REST API is at 
-         * https://github.com/ipython/ipython/wiki/IPEP-27%3A-Contents-Service
-         *
-         * A contents handles passing file operations
-         * to the back-end.  This includes checkpointing
-         * with the normal file operations.
-         *
-         * Parameters:
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          base_url: string
-         */
-        this.base_url = options.base_url;
-    };
-
-    /** Error type */
-    Contents.DIRECTORY_NOT_EMPTY_ERROR = 'DirectoryNotEmptyError';
-
-    Contents.DirectoryNotEmptyError = function() {
-        // Constructor
-        //
-        // An error representing the result of attempting to delete a non-empty
-        // directory.
-        this.message = 'A directory must be empty before being deleted.';
-    };
-    
-    Contents.DirectoryNotEmptyError.prototype = Object.create(Error.prototype);
-    Contents.DirectoryNotEmptyError.prototype.name =
-        Contents.DIRECTORY_NOT_EMPTY_ERROR;
-
-
-    Contents.prototype.api_url = function() {
-        var url_parts = [
-            this.base_url, 'api/contents',
-            utils.url_join_encode.apply(null, arguments),
-        ];
-        return utils.url_path_join.apply(null, url_parts);
-    };
-
-    /**
-     * Creates a basic error handler that wraps a jqXHR error as an Error.
-     *
-     * Takes a callback that accepts an Error, and returns a callback that can
-     * be passed directly to $.ajax, which will wrap the error from jQuery
-     * as an Error, and pass that to the original callback.
-     *
-     * @method create_basic_error_handler
-     * @param{Function} callback
-     * @return{Function}
-     */
-    Contents.prototype.create_basic_error_handler = function(callback) {
-        if (!callback) {
-            return utils.log_ajax_error;
-        }
-        return function(xhr, status, error) {
-            callback(utils.wrap_ajax_error(xhr, status, error));
-        };
-    };
-
-    /**
-     * File Functions (including notebook operations)
-     */
-
-    /**
-     * Get a file.
-     *
-     * @method get
-     * @param {String} path
-     * @param {Object} options
-     *    type : 'notebook', 'file', or 'directory'
-     *    format: 'text' or 'base64'; only relevant for type: 'file'
-     *    content: true or false; // whether to include the content
-     */
-    Contents.prototype.get = function (path, options) {
-        /**
-         * We do the call with settings so we can set cache to false.
-         */
-        var settings = {
-            processData : false,
-            cache : false,
-            type : "GET",
-            dataType : "json",
-        };
-        var url = this.api_url(path);
-        var params = {};
-        if (options.type) { params.type = options.type; }
-        if (options.format) { params.format = options.format; }
-        if (options.content === false) { params.content = '0'; }
-        return utils.promising_ajax(url + '?' + $.param(params), settings);
-    };
-
-
-    /**
-     * Creates a new untitled file or directory in the specified directory path.
-     *
-     * @method new
-     * @param {String} path: the directory in which to create the new file/directory
-     * @param {Object} options:
-     *      ext: file extension to use
-     *      type: model type to create ('notebook', 'file', or 'directory')
-     */
-    Contents.prototype.new_untitled = function(path, options) {
-        var data = JSON.stringify({
-          ext: options.ext,
-          type: options.type
-        });
-
-        var settings = {
-            processData : false,
-            type : "POST",
-            data: data,
-            contentType: 'application/json',
-            dataType : "json",
-        };
-        return utils.promising_ajax(this.api_url(path), settings);
-    };
-
-    Contents.prototype.delete = function(path) {
-        var settings = {
-            processData : false,
-            type : "DELETE",
-            dataType : "json",
-        };
-        var url = this.api_url(path);
-        return utils.promising_ajax(url, settings).catch(
-            // Translate certain errors to more specific ones.
-            function(error) {
-                // TODO: update IPEP27 to specify errors more precisely, so
-                // that error types can be detected here with certainty.
-                if (error.xhr.status === 400) {
-                    throw new Contents.DirectoryNotEmptyError();
-                }
-                throw error;
-            }
-        );
-    };
-
-    Contents.prototype.rename = function(path, new_path) {
-        var data = {path: new_path};
-        var settings = {
-            processData : false,
-            type : "PATCH",
-            data : JSON.stringify(data),
-            dataType: "json",
-            contentType: 'application/json',
-        };
-        var url = this.api_url(path);
-        return utils.promising_ajax(url, settings);
-    };
-
-    Contents.prototype.trust = function(path) {
-        var settings = {
-            processData : false,
-            type : "POST",
-            contentType: 'application/json',
-        };
-        var url = this.api_url(path, "trust");
-        return utils.promising_ajax(url, settings);
-    }
-
-    Contents.prototype.save = function(path, model) {
-        /**
-         * We do the call with settings so we can set cache to false.
-         */
-        var settings = {
-            processData : false,
-            type : "PUT",
-            dataType: "json",
-            data : JSON.stringify(model),
-            contentType: 'application/json',
-        };
-        var url = this.api_url(path);
-        return utils.promising_ajax(url, settings);
-    };
-    
-    Contents.prototype.copy = function(from_file, to_dir) {
-        /**
-         * Copy a file into a given directory via POST
-         * The server will select the name of the copied file
-         */
-        var url = this.api_url(to_dir);
-        
-        var settings = {
-            processData : false,
-            type: "POST",
-            data: JSON.stringify({copy_from: from_file}),
-            contentType: 'application/json',
-            dataType : "json",
-        };
-        return utils.promising_ajax(url, settings);
-    };
-
-    /**
-     * Checkpointing Functions
-     */
-
-    Contents.prototype.create_checkpoint = function(path) {
-        var url = this.api_url(path, 'checkpoints');
-        var settings = {
-            type : "POST",
-            contentType: false,  // no data
-            dataType : "json",
-        };
-        return utils.promising_ajax(url, settings);
-    };
-
-    Contents.prototype.list_checkpoints = function(path) {
-        var url = this.api_url(path, 'checkpoints');
-        var settings = {
-            type : "GET",
-            cache: false,
-            dataType: "json",
-        };
-        return utils.promising_ajax(url, settings);
-    };
-
-    Contents.prototype.restore_checkpoint = function(path, checkpoint_id) {
-        var url = this.api_url(path, 'checkpoints', checkpoint_id);
-        var settings = {
-            type : "POST",
-            contentType: false,  // no data
-        };
-        return utils.promising_ajax(url, settings);
-    };
-
-    Contents.prototype.delete_checkpoint = function(path, checkpoint_id) {
-        var url = this.api_url(path, 'checkpoints', checkpoint_id);
-        var settings = {
-            type : "DELETE",
-        };
-        return utils.promising_ajax(url, settings);
-    };
-
-    /**
-     * File management functions
-     */
-
-    /**
-     * List notebooks and directories at a given path
-     *
-     * On success, load_callback is called with an array of dictionaries
-     * representing individual files or directories.  Each dictionary has
-     * the keys:
-     *     type: "notebook" or "directory"
-     *     created: created date
-     *     last_modified: last modified dat
-     * @method list_notebooks
-     * @param {String} path The path to list notebooks in
-     */
-    Contents.prototype.list_contents = function(path) {
-        return this.get(path, {type: 'directory'});
-    };
-
-    return {'Contents': Contents};
-});
diff --git a/notebook/static/services/kernels/comm.js b/notebook/static/services/kernels/comm.js
deleted file mode 100644
index cba0ac71c..000000000
--- a/notebook/static/services/kernels/comm.js
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-], function($, utils) {
-    "use strict";
-
-    //-----------------------------------------------------------------------
-    // CommManager class
-    //-----------------------------------------------------------------------
-    
-    var CommManager = function (kernel) {
-        this.comms = {};
-        this.targets = {};
-        if (kernel !== undefined) {
-            this.init_kernel(kernel);
-        }
-    };
-    
-    CommManager.prototype.init_kernel = function (kernel) {
-        /**
-         * connect the kernel, and register message handlers
-         */
-        this.kernel = kernel;
-        var msg_types = ['comm_open', 'comm_msg', 'comm_close'];
-        for (var i = 0; i < msg_types.length; i++) {
-            var msg_type = msg_types[i];
-            kernel.register_iopub_handler(msg_type, $.proxy(this[msg_type], this));
-        }
-    };
-
-    CommManager.prototype.new_comm = function (target_name, data, callbacks, metadata, comm_id, buffers) {
-        /**
-         * Create a new Comm, register it, and open its Kernel-side counterpart
-         * Mimics the auto-registration in `Comm.__init__` in the Jupyter Comm.
-         *
-         * argument comm_id is optional
-         */
-        var comm = new Comm(target_name, comm_id);
-        this.register_comm(comm);
-        comm.open(data, callbacks, metadata, buffers);
-        return comm;
-    };
-    
-    CommManager.prototype.register_target = function (target_name, f) {
-        /**
-         * Register a target function for a given target name
-         */
-        this.targets[target_name] = f;
-    };
-    
-    CommManager.prototype.unregister_target = function (target_name, f) {
-        /**
-         * Unregister a target function for a given target name
-         */
-        delete this.targets[target_name];
-    };
-    
-    CommManager.prototype.register_comm = function (comm) {
-        /**
-         * Register a comm in the mapping
-         */
-        this.comms[comm.comm_id] = Promise.resolve(comm);
-        comm.kernel = this.kernel;
-        return comm.comm_id;
-    };
-    
-    CommManager.prototype.unregister_comm = function (comm) {
-        /**
-         * Remove a comm from the mapping
-         */
-        delete this.comms[comm.comm_id];
-    };
-    
-    // comm message handlers
-    
-    CommManager.prototype.comm_open = function (msg) {
-        var content = msg.content;
-        var that = this;
-        var comm_id = content.comm_id;
-
-        this.comms[comm_id] = utils.load_class(content.target_name, content.target_module, 
-            this.targets).then(function(target) {
-                var comm = new Comm(content.target_name, comm_id);
-                comm.kernel = that.kernel;
-                try {
-                    var response = target(comm, msg);
-                } catch (e) {
-                    comm.close();
-                    that.unregister_comm(comm);
-                    var wrapped_error = new utils.WrappedError("Exception opening new comm", e);
-                    console.error(wrapped_error);
-                    return Promise.reject(wrapped_error);
-                }
-                // Regardless of the target return value, we need to
-                // then return the comm
-                return Promise.resolve(response).then(function() {return comm;});
-            }, utils.reject('Could not open comm', true));
-        return this.comms[comm_id];
-    };
-    
-    CommManager.prototype.comm_close = function(msg) {
-        var content = msg.content;
-        if (this.comms[content.comm_id] === undefined) {
-            console.error('Comm promise not found for comm id ' + content.comm_id);
-            return;
-        }
-        var that = this;
-        this.comms[content.comm_id] = this.comms[content.comm_id].then(function(comm) {
-            that.unregister_comm(comm);
-            try {
-                comm.handle_close(msg);
-            } catch (e) {
-                console.log("Exception closing comm: ", e, e.stack, msg);
-            }
-            // don't return a comm, so that further .then() functions
-            // get an undefined comm input
-        });
-        return this.comms[content.comm_id];
-    };
-    
-    CommManager.prototype.comm_msg = function(msg) {
-        var content = msg.content;
-        if (this.comms[content.comm_id] === undefined) {
-            console.error('Comm promise not found for comm id ' + content.comm_id);
-            return;
-        }
-
-        this.comms[content.comm_id] = this.comms[content.comm_id].then(function(comm) {
-            return (Promise.resolve(comm.handle_msg(msg))
-                .catch(utils.reject('Exception handling comm message'))
-                .then(function() {return comm;}));
-        });
-        return this.comms[content.comm_id];
-    };
-    
-    //-----------------------------------------------------------------------
-    // Comm base class
-    //-----------------------------------------------------------------------
-    
-    var Comm = function (target_name, comm_id) {
-        this.target_name = target_name;
-        this.comm_id = comm_id || utils.uuid();
-        this._msg_callback = this._close_callback = null;
-    };
-    
-    // methods for sending messages
-    Comm.prototype.open = function (data, callbacks, metadata, buffers) {
-        var content = {
-            comm_id : this.comm_id,
-            target_name : this.target_name,
-            data : data || {},
-        };
-        return this.kernel.send_shell_message("comm_open", content, callbacks, metadata, buffers);
-    };
-    
-    Comm.prototype.send = function (data, callbacks, metadata, buffers) {
-        var content = {
-            comm_id : this.comm_id,
-            data : data || {},
-        };
-        return this.kernel.send_shell_message("comm_msg", content, callbacks, metadata, buffers);
-    };
-
-    Comm.prototype.close = function (data, callbacks, metadata, buffers) {
-        var content = {
-            comm_id : this.comm_id,
-            data : data || {},
-        };
-        return this.kernel.send_shell_message("comm_close", content, callbacks, metadata, buffers);
-    };
-    
-    // methods for registering callbacks for incoming messages
-    Comm.prototype._register_callback = function (key, callback) {
-        this['_' + key + '_callback'] = callback;
-    };
-    
-    Comm.prototype.on_msg = function (callback) {
-        this._register_callback('msg', callback);
-    };
-    
-    Comm.prototype.on_close = function (callback) {
-        this._register_callback('close', callback);
-    };
-    
-    // methods for handling incoming messages
-    
-    Comm.prototype._callback = function (key, msg) {
-        var callback = this['_' + key + '_callback'];
-        if (callback) {
-            try {
-                return callback(msg);
-            } catch (e) {
-                console.log("Exception in Comm callback", e, e.stack, msg);
-            }
-        }
-    };
-    
-    Comm.prototype.handle_msg = function (msg) {
-        return this._callback('msg', msg);
-    };
-    
-    Comm.prototype.handle_close = function (msg) {
-        this._callback('close', msg);
-    };
-    
-    return {
-        'CommManager': CommManager,
-        'Comm': Comm
-    };
-});
diff --git a/notebook/static/services/kernels/kernel.js b/notebook/static/services/kernels/kernel.js
deleted file mode 100644
index e176ade32..000000000
--- a/notebook/static/services/kernels/kernel.js
+++ /dev/null
@@ -1,1264 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    './comm',
-    './serialize',
-    'base/js/events'
-], function($, utils, comm, serialize, events) {
-    "use strict";
-
-    /**
-     * A Kernel class to communicate with the Python kernel. This
-     * should generally not be constructed directly, but be created
-     * by.  the `Session` object. Once created, this object should be
-     * used to communicate with the kernel.
-     * 
-     * Preliminary documentation for the REST API is at
-     * https://github.com/ipython/ipython/wiki/IPEP-16%3A-Notebook-multi-directory-dashboard-and-URL-mapping#kernels-api
-     * 
-     * Documentation for the messaging specifications is at
-     * https://jupyter-client.readthedocs.io/en/stable/messaging.html
-     *
-     * @class Kernel
-     * @param {string} kernel_service_url - the URL to access the kernel REST api
-     * @param {string} ws_url - the websockets URL
-     * @param {string} name - the kernel type (e.g. python3)
-     */
-    var Kernel = function (kernel_service_url, ws_url, name) {
-        this.events = events;
-
-        this.id = null;
-        this.name = name;
-        this.ws = null;
-        this._stopping = false;
-
-        this.kernel_service_url = kernel_service_url;
-        this.kernel_url = null;
-        this.ws_url = ws_url || utils.get_body_data("wsUrl");
-        if (!this.ws_url) {
-            // trailing 's' in https will become wss for secure web sockets
-            this.ws_url = location.protocol.replace('http', 'ws') + "//" + location.host;
-        }
-
-        this.username = "username";
-        this.session_id = utils.uuid();
-        this._msg_callbacks = {};
-        this._msg_callbacks_overrides = {};
-        this._display_id_to_parent_ids = {};
-        this._msg_queue = Promise.resolve();
-        this.info_reply = {}; // kernel_info_reply stored here after starting
-
-        if (typeof(WebSocket) !== 'undefined') {
-            this.WebSocket = WebSocket;
-        } else if (typeof(MozWebSocket) !== 'undefined') {
-            this.WebSocket = MozWebSocket;
-        } else {
-            alert('Your browser does not have WebSocket support, please try Chrome, Safari or Firefox ≥ 6. Firefox 4 and 5 are also supported by you have to enable WebSockets in about:config.');
-        }
-        
-        this.bind_events();
-        this.init_iopub_handlers();
-        this.comm_manager = new comm.CommManager(this);
-        
-        this.last_msg_id = null;
-        this.last_msg_callbacks = {};
-
-        this._autorestart_attempt = 0;
-        this._reconnect_attempt = 0;
-        this.reconnect_limit = 7;
-        
-        this._pending_messages = [];
-    };
-
-    /**
-     * @function _get_msg
-     */
-    Kernel.prototype._get_msg = function (msg_type, content, metadata, buffers) {
-        var msg = {
-            header : {
-                date: new Date().toISOString(),
-                msg_id : utils.uuid(),
-                username : this.username,
-                session : this.session_id,
-                msg_type : msg_type,
-                version : "5.2",
-            },
-            metadata : metadata || {},
-            content : content,
-            buffers : buffers || [],
-            parent_header : {}
-        };
-        return msg;
-    };
-
-    /**
-     * @function bind_events
-     */
-    Kernel.prototype.bind_events = function () {
-        var that = this;
-        this.events.on('send_input_reply.Kernel', function(evt, data) { 
-            that.send_input_reply(data);
-        });
-
-        var record_status = function (evt, info) {
-            console.log('Kernel: ' + evt.type + ' (' + info.kernel.id + ')');
-        };
-
-        this.events.on('kernel_created.Kernel', record_status);
-        this.events.on('kernel_reconnecting.Kernel', record_status);
-        this.events.on('kernel_connected.Kernel', record_status);
-        this.events.on('kernel_starting.Kernel', record_status);
-        this.events.on('kernel_restarting.Kernel', record_status);
-        this.events.on('kernel_autorestarting.Kernel', record_status);
-        this.events.on('kernel_interrupting.Kernel', record_status);
-        this.events.on('kernel_disconnected.Kernel', record_status);
-        // these are commented out because they are triggered a lot, but can
-        // be uncommented for debugging purposes
-        //this.events.on('kernel_idle.Kernel', record_status);
-        //this.events.on('kernel_busy.Kernel', record_status);
-        this.events.on('kernel_ready.Kernel', record_status);
-        this.events.on('kernel_killed.Kernel', record_status);
-        this.events.on('kernel_dead.Kernel', record_status);
-
-        this.events.on('kernel_ready.Kernel', function () {
-            that._autorestart_attempt = 0;
-        });
-        this.events.on('kernel_connected.Kernel', function () {
-            that._reconnect_attempt = 0;
-        });
-    };
-
-    /**
-     * Initialize the iopub handlers.
-     *
-     * @function init_iopub_handlers
-     */
-    Kernel.prototype.init_iopub_handlers = function () {
-        var output_msg_types = ['stream', 'display_data', 'execute_result', 'error', 'update_display_data'];
-        this._iopub_handlers = {};
-        this.register_iopub_handler('status', $.proxy(this._handle_status_message, this));
-        this.register_iopub_handler('clear_output', $.proxy(this._handle_clear_output, this));
-        this.register_iopub_handler('execute_input', $.proxy(this._handle_input_message, this));
-        this.register_iopub_handler('shutdown_reply', $.proxy(this._handle_shutdown_message, this));
-        
-        for (var i=0; i < output_msg_types.length; i++) {
-            this.register_iopub_handler(output_msg_types[i], $.proxy(this._handle_output_message, this));
-        }
-    };
-
-    /**
-     * GET /api/kernels
-     *
-     * Get the list of running kernels.
-     *
-     * @function list
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Kernel.prototype.list = function (success, error) {
-        utils.ajax(this.kernel_service_url, {
-            processData: false,
-            cache: false,
-            type: "GET",
-            dataType: "json",
-            success: success,
-            error: this._on_error(error)
-        });
-    };
-
-    /**
-     * POST /api/kernels
-     *
-     * Start a new kernel.
-     *
-     * In general this shouldn't be used -- the kernel should be
-     * started through the session API. If you use this function and
-     * are also using the session API then your session and kernel
-     * WILL be out of sync!
-     *
-     * @function start
-     * @param {params} [Object] - parameters to include in the query string
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Kernel.prototype.start = function (params, success, error) {
-        var url = this.kernel_service_url;
-        var qs = $.param(params || {}); // query string for sage math stuff
-        if (qs !== "") {
-            url = url + "?" + qs;
-        }
-
-        this.events.trigger('kernel_starting.Kernel', {kernel: this});
-        var that = this;
-        var on_success = function (data, status, xhr) {
-            that.events.trigger('kernel_created.Kernel', {kernel: that});
-            that._kernel_created(data);
-            if (success) {
-                success(data, status, xhr);
-            }
-        };
-
-        utils.ajax(url, {
-            processData: false,
-            cache: false,
-            type: "POST",
-            data: JSON.stringify({name: this.name}),
-            contentType: 'application/json',
-            dataType: "json",
-            success: this._on_success(on_success),
-            error: this._on_error(error)
-        });
-
-        return url;
-    };
-
-    /**
-     * GET /api/kernels/[:kernel_id]
-     *
-     * Get information about the kernel.
-     *
-     * @function get_info
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Kernel.prototype.get_info = function (success, error) {
-        utils.ajax(this.kernel_url, {
-            processData: false,
-            cache: false,
-            type: "GET",
-            dataType: "json",
-            success: this._on_success(success),
-            error: this._on_error(error)
-        });
-    };
-
-    /**
-     * DELETE /api/kernels/[:kernel_id]
-     *
-     * Shutdown the kernel.
-     *
-     * If you are also using sessions, then this function should NOT be
-     * used. Instead, use Session.delete. Otherwise, the session and
-     * kernel WILL be out of sync.
-     *
-     * @function kill
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Kernel.prototype.kill = function (success, error) {
-        this.events.trigger('kernel_killed.Kernel', {kernel: this});
-        this._kernel_dead();
-        utils.ajax(this.kernel_url, {
-            processData: false,
-            cache: false,
-            type: "DELETE",
-            dataType: "json",
-            success: this._on_success(success),
-            error: this._on_error(error)
-        });
-    };
-
-    /**
-     * POST /api/kernels/[:kernel_id]/interrupt
-     *
-     * Interrupt the kernel.
-     *
-     * @function interrupt
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Kernel.prototype.interrupt = function (success, error) {
-        this.events.trigger('kernel_interrupting.Kernel', {kernel: this});
-
-        var that = this;
-        var on_success = function (data, status, xhr) {
-            /**
-             * get kernel info so we know what state the kernel is in
-             */
-            that.kernel_info();
-            if (success) {
-                success(data, status, xhr);
-            }
-        };
-
-        var url = utils.url_path_join(this.kernel_url, 'interrupt');
-        utils.ajax(url, {
-            processData: false,
-            cache: false,
-            type: "POST",
-            contentType: false,  // there's no data with this
-            dataType: "json",
-            success: this._on_success(on_success),
-            error: this._on_error(error)
-        });
-    };
-
-    Kernel.prototype.restart = function (success, error) {
-        /**
-         * POST /api/kernels/[:kernel_id]/restart
-         *
-         * Restart the kernel.
-         *
-         * @function interrupt
-         * @param {function} [success] - function executed on ajax success
-         * @param {function} [error] - function executed on ajax error
-         */
-        this.events.trigger('kernel_restarting.Kernel', {kernel: this});
-        this.stop_channels();
-        this._msg_callbacks = {};
-        this._msg_callbacks_overrides = {};
-        this._display_id_to_parent_ids = {};
-
-        var that = this;
-        var on_success = function (data, status, xhr) {
-            that.events.trigger('kernel_created.Kernel', {kernel: that});
-            that._kernel_created(data);
-            if (success) {
-                success(data, status, xhr);
-            }
-        };
-
-        var on_error = function (xhr, status, err) {
-            that.events.trigger('kernel_failed_restart.Kernel', {kernel: that});
-            that._kernel_dead();
-            if (error) {
-                error(xhr, status, err);
-            }
-        };
-
-        var url = utils.url_path_join(this.kernel_url, 'restart');
-        utils.ajax(url, {
-            processData: false,
-            cache: false,
-            type: "POST",
-            contentType: false,  // there's no data with this
-            dataType: "json",
-            success: this._on_success(on_success),
-            error: this._on_error(on_error)
-        });
-    };
-
-    Kernel.prototype.reconnect = function () {
-        /**
-         * Reconnect to a disconnected kernel. This is not actually a
-         * standard HTTP request, but useful function nonetheless for
-         * reconnecting to the kernel if the connection is somehow lost.
-         *
-         * @function reconnect
-         */
-        if (this.is_connected()) {
-            this.stop_channels();
-        }
-        this._reconnect_attempt = this._reconnect_attempt + 1;
-        this.events.trigger('kernel_reconnecting.Kernel', {
-            kernel: this,
-            attempt: this._reconnect_attempt,
-        });
-        this.start_channels();
-    };
-
-    Kernel.prototype._on_success = function (success) {
-        /**
-         * Handle a successful AJAX request by updating the kernel id and
-         * name from the response, and then optionally calling a provided
-         * callback.
-         *
-         * @function _on_success
-         * @param {function} success - callback
-         */
-        var that = this;
-        return function (data, status, xhr) {
-            if (data) {
-                that.id = data.id;
-                that.name = data.name;
-            }
-            that.kernel_url = utils.url_path_join(that.kernel_service_url,
-                encodeURIComponent(that.id));
-            if (success) {
-                success(data, status, xhr);
-            }
-        };
-    };
-
-    Kernel.prototype._on_error = function (error) {
-        /**
-         * Handle a failed AJAX request by logging the error message, and
-         * then optionally calling a provided callback.
-         *
-         * @function _on_error
-         * @param {function} error - callback
-         */
-        return function (xhr, status, err) {
-            utils.log_ajax_error(xhr, status, err);
-            if (error) {
-                error(xhr, status, err);
-            }
-        };
-    };
-
-    Kernel.prototype._kernel_created = function (data) {
-        /**
-         * Perform necessary tasks once the kernel has been started,
-         * including actually connecting to the kernel.
-         *
-         * @function _kernel_created
-         * @param {Object} data - information about the kernel including id
-         */
-        this.id = data.id;
-        this.kernel_url = utils.url_path_join(this.kernel_service_url,
-            encodeURIComponent(this.id));
-        this.start_channels();
-    };
-
-    Kernel.prototype._kernel_connected = function () {
-        /**
-         * Perform necessary tasks once the connection to the kernel has
-         * been established. This includes requesting information about
-         * the kernel.
-         *
-         * @function _kernel_connected
-         */
-        this.events.trigger('kernel_connected.Kernel', {kernel: this});
-
-        // Send pending messages. We shift the message off the queue
-        // after the message is sent so that if there is an exception,
-        // the message is still pending.
-        while (this._pending_messages.length > 0) {
-          this.ws.send(this._pending_messages[0]);
-          this._pending_messages.shift();
-        }
-
-        // get kernel info so we know what state the kernel is in
-        var that = this;
-        this.kernel_info(function (reply) {
-            that.info_reply = reply.content;
-            that.events.trigger('kernel_ready.Kernel', {kernel: that});
-        });
-    };
-
-    Kernel.prototype._kernel_dead = function () {
-        /**
-         * Perform necessary tasks after the kernel has died. This closing
-         * communication channels to the kernel if they are still somehow
-         * open.
-         *
-         * @function _kernel_dead
-         */
-        this.stop_channels();
-    };
-
-    Kernel.prototype.start_channels = function () {
-        /**
-         * Start the websocket channels.
-         * Will stop and restart them if they already exist.
-         *
-         * @function start_channels
-         */
-        var that = this;
-        this.stop_channels();
-        var ws_host_url = this.ws_url + this.kernel_url;
-
-        console.log("Starting WebSockets:", ws_host_url);
-
-        this.ws = new this.WebSocket([
-                that.ws_url,
-                utils.url_path_join(that.kernel_url, 'channels'),
-                "?session_id=" + that.session_id
-            ].join('')
-        );
-        
-        var already_called_onclose = false; // only alert once
-        var ws_closed_early = function(evt){
-            console.log("WebSocket closed early", evt);
-            if (already_called_onclose){
-                return;
-            }
-            already_called_onclose = true;
-            // If the websocket was closed early, that could mean
-            // that the kernel is actually dead. Try getting
-            // information about the kernel from the API call --
-            // if that fails, then assume the kernel is dead,
-            // otherwise just follow the typical websocket closed
-            // protocol.
-            that.get_info(function () {
-                that._ws_closed(ws_host_url, false);
-            }, function () {
-                that.events.trigger('kernel_dead.Kernel', {kernel: that});
-                that._kernel_dead();
-            });
-        };
-        var ws_closed_late = function(evt){
-            console.log("WebSocket closed unexpectedly", evt);
-            if (already_called_onclose){
-                return;
-            }
-            already_called_onclose = true;
-            that._ws_closed(ws_host_url, false);
-        };
-        var ws_error = function(evt){
-            if (already_called_onclose){
-                return;
-            }
-            already_called_onclose = true;
-            that._ws_closed(ws_host_url, true);
-        };
-
-        this.ws.onopen = $.proxy(this._ws_opened, this);
-        this.ws.onclose = ws_closed_early;
-        this.ws.onerror = ws_error;
-        // switch from early-close to late-close message after 1s
-        setTimeout(function() {
-            if (that.ws !== null && !that._stopping) {
-                that.ws.onclose = ws_closed_late;
-            }
-        }, 1000);
-        this.ws.onmessage = $.proxy(this._handle_ws_message, this);
-    };
-
-    Kernel.prototype._ws_opened = function (evt) {
-        /**
-         * Handle a websocket entering the open state,
-         * signaling that the kernel is connected when websocket is open.
-         *
-         * @function _ws_opened
-         */
-        if (this.is_connected()) {
-            // all events ready, trigger started event.
-            this._kernel_connected();
-        }
-    };
-
-    Kernel.prototype._ws_closed = function(ws_url, error) {
-        /**
-         * Handle a websocket entering the closed state.  If the websocket
-         * was not closed due to an error, try to reconnect to the kernel.
-         *
-         * @function _ws_closed
-         * @param {string} ws_url - the websocket url
-         * @param {bool} error - whether the connection was closed due to an error
-         */
-        this.stop_channels();
-
-        this.events.trigger('kernel_disconnected.Kernel', {kernel: this});
-        if (error) {
-            console.log('WebSocket connection failed: ', ws_url, error);
-            this.events.trigger('kernel_connection_failed.Kernel', {
-                kernel: this,
-                ws_url: ws_url,
-                attempt: this._reconnect_attempt,
-                error: error,
-            });
-        }
-        this._schedule_reconnect();
-    };
-    
-    Kernel.prototype._schedule_reconnect = function () {
-        /**
-         * function to call when kernel connection is lost
-         * schedules reconnect, or fires 'connection_dead' if reconnect limit is hit
-         */
-        if (this._reconnect_attempt < this.reconnect_limit) {
-            var timeout = Math.pow(2, this._reconnect_attempt);
-            console.log("Connection lost, reconnecting in " + timeout + " seconds.");
-            setTimeout($.proxy(this.reconnect, this), 1e3 * timeout);
-        } else {
-            this.events.trigger('kernel_connection_dead.Kernel', {
-                kernel: this,
-                reconnect_attempt: this._reconnect_attempt,
-            });
-            console.log("Failed to reconnect, giving up.");
-        }
-    };
-    
-    Kernel.prototype.stop_channels = function () {
-        /**
-         * Close the websocket. After successful close, the value
-         * in `this.ws` will be null.
-         *
-         * @function stop_channels
-         */
-        var that = this;
-        var close = function () {
-            that._stopping = false;
-            if (that.ws && that.ws.readyState === WebSocket.CLOSED) {
-                that.ws = null;
-            }
-        };
-        if (this.ws !== null) {
-            // flag to avoid races with on_close_late
-            this._stopping = true;
-            if (this.ws.readyState === WebSocket.OPEN) {
-                this.ws.onclose = close;
-                this.ws.close();
-            } else {
-                close();
-            }
-        }
-    };
-
-    Kernel.prototype.is_connected = function () {
-        /**
-         * Check whether there is a connection to the kernel. This
-         * function only returns true if websocket has been
-         * created and has a state of WebSocket.OPEN.
-         *
-         * @function is_connected
-         * @returns {bool} - whether there is a connection
-         */
-        // if any channel is not ready, then we're not connected
-        if (this.ws === null) {
-            return false;
-        }
-        if (this.ws.readyState !== WebSocket.OPEN) {
-            return false;
-        }
-        return true;
-    };
-
-    Kernel.prototype.is_fully_disconnected = function () {
-        /**
-         * Check whether the connection to the kernel has been completely
-         * severed. This function only returns true if all channel objects
-         * are null.
-         *
-         * @function is_fully_disconnected
-         * @returns {bool} - whether the kernel is fully disconnected
-         */
-        return (this.ws === null);
-    };
-    
-    Kernel.prototype._send = function(msg) {
-      /**
-       * Send a message (if the kernel is connected) or queue the message for future delivery
-       *
-       * Pending messages will automatically be sent when a kernel becomes connected.
-       *
-       * @function _send
-       * @param msg
-       */
-      if (this.is_connected()) {
-            this.ws.send(msg);
-        } else {
-            this._pending_messages.push(msg);
-        }
-    };
-    
-    Kernel.prototype.send_shell_message = function (msg_type, content, callbacks, metadata, buffers) {
-        /**
-         * Send a message on the Kernel's shell channel
-         *
-         * If the kernel is not connected, the message will be buffered.
-         * 
-         * @function send_shell_message
-         */
-        var msg = this._get_msg(msg_type, content, metadata, buffers);
-        msg.channel = 'shell';
-        this.set_callbacks_for_msg(msg.header.msg_id, callbacks);
-        this._send(serialize.serialize(msg));
-        return msg.header.msg_id;
-    };
-
-    Kernel.prototype.kernel_info = function (callback) {
-        /**
-         * Get kernel info
-         *
-         * @function kernel_info
-         * @param callback {function}
-         *
-         * When calling this method, pass a callback function that expects one argument.
-         * The callback will be passed the complete `kernel_info_reply` message documented
-         * [here](https://jupyter-client.readthedocs.io/en/latest/messaging.html#kernel-info)
-         */
-        var callbacks;
-        if (callback) {
-            callbacks = { shell : { reply : callback } };
-        }
-        return this.send_shell_message("kernel_info_request", {}, callbacks);
-    };
-
-    Kernel.prototype.comm_info = function (target_name, callback) {
-        /**
-         * Get comm info
-         *
-         * @function comm_info
-         * @param callback {function}
-         *
-         * When calling this method, pass a callback function that expects one argument.
-         * The callback will be passed the complete `comm_info_reply` message documented
-         * [here](https://jupyter-client.readthedocs.io/en/latest/messaging.html#comm_info)
-         */
-        var callbacks;
-        if (callback) {
-            callbacks = { shell : { reply : callback } };
-        }
-        var content = {
-            target_name : target_name,
-        };
-        return this.send_shell_message("comm_info_request", content, callbacks);
-    };
-
-    Kernel.prototype.inspect = function (code, cursor_pos, callback) {
-        /**
-         * Get info on an object
-         *
-         * When calling this method, pass a callback function that expects one argument.
-         * The callback will be passed the complete `inspect_reply` message documented
-         * [here](https://jupyter-client.readthedocs.io/en/latest/messaging.html#object-information)
-         *
-         * @function inspect
-         * @param code {string}
-         * @param cursor_pos {integer}
-         * @param callback {function}
-         */
-        var callbacks;
-        if (callback) {
-            callbacks = { shell : { reply : callback } };
-        }
-        
-        var content = {
-            code : code,
-            cursor_pos : cursor_pos,
-            detail_level : 0
-        };
-        return this.send_shell_message("inspect_request", content, callbacks);
-    };
-
-    Kernel.prototype.execute = function (code, callbacks, options) {
-        /**
-         * Execute given code into kernel, and pass result to callback.
-         *
-         * @async
-         * @function execute
-         * @param {string} code
-         * @param [callbacks] {Object} With the following keys (all optional)
-         *      @param callbacks.shell.reply {function}
-         *      @param callbacks.shell.payload.[payload_name] {function}
-         *      @param callbacks.iopub.output {function}
-         *      @param callbacks.iopub.clear_output {function}
-         *      @param callbacks.input {function}
-         *      @param callbacks.clear_on_done=true {Boolean}
-         * @param {object} [options]
-         *      @param [options.silent=false] {Boolean}
-         *      @param [options.user_expressions=empty_dict] {Dict}
-         *      @param [options.allow_stdin=false] {Boolean} true|false
-         *
-         * @example
-         *
-         * The options object should contain the options for the execute
-         * call. Its default values are:
-         *
-         *      options = {
-         *        silent : true,
-         *        user_expressions : {},
-         *        allow_stdin : false
-         *      }
-         *
-         * When calling this method pass a callbacks structure of the
-         * form:
-         *
-         *      callbacks = {
-         *       shell : {
-         *         reply : execute_reply_callback,
-         *         payload : {
-         *           set_next_input : set_next_input_callback,
-         *         }
-         *       },
-         *       iopub : {
-         *         output : output_callback,
-         *         clear_output : clear_output_callback,
-         *       },
-         *       input : raw_input_callback
-         *      }
-         *
-         * Each callback will be passed the entire message as a single
-         * argument.  Payload handlers will be passed the corresponding
-         * payload and the execute_reply message.
-         */
-        var content = {
-            code : code,
-            silent : true,
-            store_history : false,
-            user_expressions : {},
-            allow_stdin : false
-        };
-        callbacks = callbacks || {};
-        if (callbacks.input !== undefined) {
-            content.allow_stdin = true;
-        }
-        $.extend(true, content, options);
-        this.events.trigger('execution_request.Kernel', {kernel: this, content: content});
-        return this.send_shell_message("execute_request", content, callbacks);
-    };
-
-    /**
-     * When calling this method, pass a function to be called with the
-     * `complete_reply` message as its only argument when it arrives.
-     *
-     * `complete_reply` is documented
-     * [here](https://jupyter-client.readthedocs.io/en/latest/messaging.html#complete)
-     *
-     * @function complete
-     * @param code {string}
-     * @param cursor_pos {integer}
-     * @param callback {function}
-     */
-    Kernel.prototype.complete = function (code, cursor_pos, callback) {
-        var callbacks;
-        if (callback) {
-            callbacks = { shell : { reply : callback } };
-        }
-        var content = {
-            code : code,
-            cursor_pos : cursor_pos
-        };
-        return this.send_shell_message("complete_request", content, callbacks);
-    };
-
-    /**
-     * @function send_input_reply
-     */
-    Kernel.prototype.send_input_reply = function (input) {
-        var content = {
-            value : input
-        };
-        this.events.trigger('input_reply.Kernel', {kernel: this, content: content});
-        var msg = this._get_msg("input_reply", content);
-        msg.channel = 'stdin';
-        this._send(serialize.serialize(msg));
-        return msg.header.msg_id;
-    };
-
-    /**
-     * @function register_iopub_handler
-     */
-    Kernel.prototype.register_iopub_handler = function (msg_type, callback) {
-        this._iopub_handlers[msg_type] = callback;
-    };
-
-    /**
-     * Get the iopub handler for a specific message type.
-     *
-     * @function get_iopub_handler
-     */
-    Kernel.prototype.get_iopub_handler = function (msg_type) {
-        return this._iopub_handlers[msg_type];
-    };
-
-    /**
-     * Get callbacks for a specific message.
-     *
-     * @function get_callbacks_for_msg
-     */
-    Kernel.prototype.get_callbacks_for_msg = function (msg_id) {
-        if (msg_id == this.last_msg_id) {
-            return this.last_msg_callbacks;
-        } else {
-            return this._msg_callbacks[msg_id];
-        }
-    };
-
-    /**
-     * Get output callbacks for a specific message.
-     *
-     * @function get_output_callbacks_for_msg
-     *
-     * Since output callbacks can be overridden, we first check the override stack.
-     */
-    Kernel.prototype.get_output_callbacks_for_msg = function (msg_id) {
-        return this.get_callbacks_for_msg(this.get_output_callback_id(msg_id));
-    };
-
-
-    /**
-     * Get the output callback id for a message
-     *
-     * Since output callbacks can be redirected, this may not be the same as
-     * the msg_id.
-     *
-     * @function get_output_callback_id
-     */
-    Kernel.prototype.get_output_callback_id = function (msg_id) {
-        var callback_id = msg_id;
-        var overrides = this._msg_callbacks_overrides[msg_id];
-        if (overrides && overrides.length > 0) {
-            callback_id = overrides[overrides.length-1];
-        }
-        return callback_id
-    }
-
-    /**
-     * Clear callbacks for a specific message.
-     *
-     * @function clear_callbacks_for_msg
-     */
-    Kernel.prototype.clear_callbacks_for_msg = function (msg_id) {
-        if (this._msg_callbacks[msg_id] !== undefined ) {
-            var callbacks = this._msg_callbacks[msg_id];
-            var kernel = this;
-            // clear display_id:msg_id map for display_ids associated with this msg_id
-            if (!callbacks) return;
-            callbacks.display_ids.map(function (display_id) {
-                var msg_ids = kernel._display_id_to_parent_ids[display_id];
-                if (msg_ids) {
-                    var idx = msg_ids.indexOf(msg_id);
-                    if (idx === -1) {
-                        return;
-                    }
-                    if (msg_ids.length === 1) {
-                        delete kernel._display_id_to_parent_ids[display_id];
-                    } else {
-                        msg_ids.splice(idx, 1);
-                        kernel._display_id_to_parent_ids[display_id] = msg_ids;
-                    }
-                }
-            });
-            delete this._msg_callbacks[msg_id];
-        }
-    };
-    
-    /**
-     * @function _finish_shell
-     */
-    Kernel.prototype._finish_shell = function (msg_id) {
-        var callbacks = this._msg_callbacks[msg_id];
-        if (callbacks !== undefined) {
-            callbacks.shell_done = true;
-            if (callbacks.clear_on_done && callbacks.iopub_done) {
-                this.clear_callbacks_for_msg(msg_id);
-            }
-        }
-    };
-
-    /**
-     * @function _finish_iopub
-     */
-    Kernel.prototype._finish_iopub = function (msg_id) {
-        var callbacks = this._msg_callbacks[msg_id];
-        if (callbacks !== undefined) {
-            callbacks.iopub_done = true;
-            if (callbacks.clear_on_done && callbacks.shell_done) {
-                this.clear_callbacks_for_msg(msg_id);
-            }
-        }
-        this.events.trigger('finished_iopub.Kernel', {kernel: this, msg_id: msg_id});
-    };
-    
-    /**
-     * Set callbacks for a particular message.
-     * Callbacks should be a struct of the following form:
-     * shell : {
-     * 
-     * }
-     *
-     * If the third parameter is truthy, the callback is set as the last
-     * callback registered.
-     *
-     * @function set_callbacks_for_msg
-     */
-    Kernel.prototype.set_callbacks_for_msg = function (msg_id, callbacks, save) {
-        var remember = save || true;
-        if (remember) {
-            this.last_msg_id = msg_id;
-        }
-        if (callbacks) {
-            // shallow-copy mapping, because we will modify it at the top level
-            var cbcopy = this._msg_callbacks[msg_id] = this.last_msg_callbacks = {};
-            cbcopy.shell = callbacks.shell;
-            cbcopy.iopub = callbacks.iopub;
-            cbcopy.input = callbacks.input;
-            cbcopy.clear_on_done = callbacks.clear_on_done;
-            cbcopy.shell_done = (!callbacks.shell);
-            cbcopy.iopub_done = (!callbacks.iopub);
-            cbcopy.display_ids = [];
-            if (callbacks.clear_on_done === undefined) {
-                // default to clear-on-done
-                cbcopy.clear_on_done = true;
-            }
-        } else if (remember) {
-            this.last_msg_callbacks = {};
-        }
-    };
-
-    /**
-     * Override output callbacks for a particular msg_id
-     */
-    Kernel.prototype.output_callback_overrides_push = function(msg_id, callback_id) {
-        var output_callbacks = this._msg_callbacks_overrides[msg_id];
-        if (!output_callbacks) {
-            this._msg_callbacks_overrides[msg_id] = output_callbacks = [];
-        }
-        output_callbacks.push(callback_id);
-    }
-
-    Kernel.prototype.output_callback_overrides_pop = function(msg_id) {
-        var callback_ids = this._msg_callbacks_overrides[msg_id];
-        if (!callback_ids) {
-            console.error("Popping callback overrides, but none registered", msg_id);
-            return;
-        }
-        return callback_ids.pop();
-    }
-
-    Kernel.prototype._handle_ws_message = function (e) {
-        var that = this;
-        this._msg_queue = this._msg_queue.then(function() {
-            return serialize.deserialize(e.data);
-        }).then(function(msg) {return that._finish_ws_message(msg);})
-        .catch(function(error) { console.error("Couldn't process kernel message", error); });
-    };
-
-    Kernel.prototype._finish_ws_message = function (msg) {
-        switch (msg.channel) {
-            case 'shell':
-                return this._handle_shell_reply(msg);
-            case 'iopub':
-                return this._handle_iopub_message(msg);
-            case 'stdin':
-                return this._handle_input_request(msg);
-            default:
-                console.error("unrecognized message channel", msg.channel, msg);
-        }
-    };
-    
-    Kernel.prototype._handle_shell_reply = function (reply) {
-        this.events.trigger('shell_reply.Kernel', {kernel: this, reply:reply});
-        var that = this;
-        var content = reply.content;
-        var metadata = reply.metadata;
-        var parent_id = reply.parent_header.msg_id;
-        var callbacks = this.get_callbacks_for_msg(parent_id);
-        var promise = Promise.resolve();
-        if (!callbacks || !callbacks.shell) {
-            return;
-        }
-        var shell_callbacks = callbacks.shell;
-        
-        // signal that shell callbacks are done
-        this._finish_shell(parent_id);
-        
-        if (shell_callbacks.reply !== undefined) {
-            promise = promise.then(function() {return shell_callbacks.reply(reply);});
-        }
-        if (content.payload && shell_callbacks.payload) {
-            promise = promise.then(function() {
-                return that._handle_payloads(content.payload, shell_callbacks.payload, reply);
-            });
-        }
-        return promise;
-    };
-
-    /**
-     * @function _handle_payloads
-     */
-    Kernel.prototype._handle_payloads = function (payloads, payload_callbacks, msg) {
-        var promise = [];
-        var l = payloads.length;
-        // Payloads are handled by triggering events because we don't want the Kernel
-        // to depend on the Notebook or Pager classes.
-        for (var i=0; i<l; i++) {
-            var payload = payloads[i];
-            var callback = payload_callbacks[payload.source];
-            if (callback) {
-                promise.push(callback(payload, msg));
-            }
-        }
-        return Promise.all(promise);
-    };
-
-    /**
-     * @function _handle_status_message
-     */
-    Kernel.prototype._handle_status_message = function (msg) {
-        var execution_state = msg.content.execution_state;
-        var parent_id = msg.parent_header.msg_id;
-        
-        // dispatch status msg callbacks, if any
-        var callbacks = this.get_callbacks_for_msg(parent_id);
-        if (callbacks && callbacks.iopub && callbacks.iopub.status) {
-            try {
-                callbacks.iopub.status(msg);
-            } catch (e) {
-                console.log("Exception in status msg handler", e, e.stack);
-            }
-        }
-        
-        if (execution_state === 'busy') {
-            this.events.trigger('kernel_busy.Kernel', {kernel: this});
-
-        } else if (execution_state === 'idle') {
-            // signal that iopub callbacks are (probably) done
-            // async output may still arrive,
-            // but only for the most recent request
-            this._finish_iopub(parent_id);
-            
-            // trigger status_idle event
-            this.events.trigger('kernel_idle.Kernel', {kernel: this});
-
-        } else if (execution_state === 'starting') {
-            this.events.trigger('kernel_starting.Kernel', {kernel: this});
-            var that = this;
-            this.kernel_info(function (reply) {
-                that.info_reply = reply.content;
-                that.events.trigger('kernel_ready.Kernel', {kernel: that});
-            });
-
-        } else if (execution_state === 'restarting') {
-            // autorestarting is distinct from restarting,
-            // in that it means the kernel died and the server is restarting it.
-            // kernel_restarting sets the notification widget,
-            // autorestart shows the more prominent dialog.
-            this._autorestart_attempt = this._autorestart_attempt + 1;
-            this.events.trigger('kernel_restarting.Kernel', {kernel: this});
-            this.events.trigger('kernel_autorestarting.Kernel', {kernel: this, attempt: this._autorestart_attempt});
-
-        } else if (execution_state === 'dead') {
-            this.events.trigger('kernel_dead.Kernel', {kernel: this});
-            this._kernel_dead();
-        }
-    };
-    
-    /**
-     * Handle clear_output message
-     *
-     * @function _handle_clear_output
-     */
-    Kernel.prototype._handle_clear_output = function (msg) {
-        var callbacks = this.get_output_callbacks_for_msg(msg.parent_header.msg_id);
-        if (!callbacks || !callbacks.iopub) {
-            return;
-        }
-        var callback = callbacks.iopub.clear_output;
-        if (callback) {
-            callback(msg);
-        }
-    };
-
-    /**
-     * handle an output message (execute_result, display_data, etc.)
-     *
-     * @function _handle_output_message
-     */
-    Kernel.prototype._handle_output_message = function (msg) {
-        var that = this;
-        var msg_id = msg.parent_header.msg_id;
-        var callbacks = this.get_output_callbacks_for_msg(msg_id);
-        if (['display_data', 'update_display_data', 'execute_result'].indexOf(msg.header.msg_type) > -1) {
-            // display_data messages may re-route based on their display_id
-            var display_id = (msg.content.transient || {}).display_id;
-            if (display_id) {
-                // it has a display_id
-                var parent_ids = this._display_id_to_parent_ids[display_id];
-                if (parent_ids) {
-                    // we've seen it before, update existing outputs with same display_id
-                    // by handling display_data as update_display_data
-                    var update_msg = $.extend(true, {}, msg);
-                    update_msg.header.msg_type = 'update_display_data';
-
-                    parent_ids.map(function (parent_id) {
-                        var callbacks = that.get_callbacks_for_msg(parent_id);
-                        if (!callbacks) return;
-                        var callback = callbacks.iopub.output;
-                        if (callback) {
-                            callback(update_msg);
-                        }
-                    });
-                }
-                // we're done here if it's update_display
-                if (msg.header.msg_type === 'update_display_data') {
-                    // it's an update, don't proceed to the normal display
-                    return;
-                }
-                // regular display_data with id, record it for future updating
-                // in _display_id_to_parent_ids for future lookup
-                if (this._display_id_to_parent_ids[display_id] === undefined) {
-                    this._display_id_to_parent_ids[display_id] = [];
-                }
-                var callback_id = this.get_output_callback_id(msg_id);
-                if (this._display_id_to_parent_ids[display_id].indexOf(callback_id) === -1) {
-                    this._display_id_to_parent_ids[display_id].push(callback_id);
-                }
-                // and in callbacks for cleanup on clear_callbacks_for_msg
-                if (callbacks && callbacks.display_ids.indexOf(display_id) === -1) {
-                    callbacks.display_ids.push(display_id);
-                }
-            }
-        }
-
-
-        if (!callbacks || !callbacks.iopub) {
-            // The message came from another client. Let the UI decide what to
-            // do with it.
-            this.events.trigger('received_unsolicited_message.Kernel', msg);
-            return;
-        }
-        var callback = callbacks.iopub.output;
-        if (callback) {
-            callback(msg);
-        }
-    };
-
-    /**
-     * Handle an input message (execute_input).
-     *
-     * @function _handle_input message
-     */
-    Kernel.prototype._handle_input_message = function (msg) {
-        var callbacks = this.get_callbacks_for_msg(msg.parent_header.msg_id);
-        if (!callbacks) {
-            // The message came from another client. Let the UI decide what to
-            // do with it.
-            this.events.trigger('received_unsolicited_message.Kernel', msg);
-        }
-    };
-
-
-    /**
-     * Handle a kernel shutdown message
-     * @function _handle_shutdown_message
-     */
-    Kernel.prototype._handle_shutdown_message = function (msg) {
-        if (!msg.content.restart) {
-            this.events.trigger('kernel_dead.Kernel', {kernel: this});
-            this._kernel_dead();
-        }
-    }
-
-
-    /**
-     * Dispatch IOPub messages to respective handlers. Each message
-     * type should have a handler.
-     *
-     * @function _handle_iopub_message
-     */
-    Kernel.prototype._handle_iopub_message = function (msg) {
-        var handler = this.get_iopub_handler(msg.header.msg_type);
-        if (handler !== undefined) {
-            return handler(msg);
-        }
-    };
-
-    /**
-     * @function _handle_input_request
-     */
-    Kernel.prototype._handle_input_request = function (request) {
-        var header = request.header;
-        var content = request.content;
-        var metadata = request.metadata;
-        var msg_type = header.msg_type;
-        if (msg_type !== 'input_request') {
-            console.log("Invalid input request!", request);
-            return;
-        }
-        var callbacks = this.get_callbacks_for_msg(request.parent_header.msg_id);
-        if (callbacks) {
-            if (callbacks.input) {
-                callbacks.input(request);
-            }
-        }
-    };
-
-    return {'Kernel': Kernel};
-});
diff --git a/notebook/static/services/kernels/serialize.js b/notebook/static/services/kernels/serialize.js
deleted file mode 100644
index a0bfd7ad8..000000000
--- a/notebook/static/services/kernels/serialize.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'underscore',
-    ], function (_) {
-    "use strict";
-    
-    var _deserialize_array_buffer = function (buf) {
-        var data = new DataView(buf);
-        // read the header: 1 + nbufs 32b integers
-        var nbufs = data.getUint32(0);
-        var offsets = [];
-        var i;
-        for (i = 1; i <= nbufs; i++) {
-            offsets.push(data.getUint32(i * 4));
-        }
-        var json_bytes = new Uint8Array(buf.slice(offsets[0], offsets[1]));
-        var msg = JSON.parse(
-            (new TextDecoder('utf8')).decode(json_bytes)
-        );
-        // the remaining chunks are stored as DataViews in msg.buffers
-        msg.buffers = [];
-        var start, stop;
-        for (i = 1; i < nbufs; i++) {
-            start = offsets[i];
-            stop = offsets[i+1] || buf.byteLength;
-            msg.buffers.push(new DataView(buf.slice(start, stop)));
-        }
-        return msg;
-    };
-    
-    var _deserialize_binary = function(data) {
-        /**
-         * deserialize the binary message format
-         * callback will be called with a message whose buffers attribute
-         * will be an array of DataViews.
-         */
-        if (data instanceof Blob) {
-            // data is Blob, have to deserialize from ArrayBuffer in reader callback
-            var reader = new FileReader();
-            var promise = new Promise(function(resolve, reject) {
-                reader.onload = function () {
-                    var msg = _deserialize_array_buffer(this.result);
-                    resolve(msg);
-                };
-            });
-            reader.readAsArrayBuffer(data);
-            return promise;
-        } else {
-            // data is ArrayBuffer, can deserialize directly
-            var msg = _deserialize_array_buffer(data);
-            return msg;
-        }
-    };
-
-    var deserialize = function (data) {
-        /**
-         * deserialize a message and return a promise for the unpacked message
-         */
-        if (typeof data === "string") {
-            // text JSON message
-            return Promise.resolve(JSON.parse(data));
-        } else {
-            // binary message
-            return Promise.resolve(_deserialize_binary(data));
-        }
-    };
-    
-    var _serialize_binary = function (msg) {
-        /**
-         * implement the binary serialization protocol
-         * serializes JSON message to ArrayBuffer
-         */
-        msg = _.clone(msg);
-        var offsets = [];
-        var buffers = [];
-        var i;
-        for (i = 0; i < msg.buffers.length; i++) {
-            // msg.buffers elements could be either views or ArrayBuffers
-            // buffers elements are ArrayBuffers
-            var b = msg.buffers[i];
-            buffers.push(b.buffer instanceof ArrayBuffer ? b.buffer : b);
-        }
-        delete msg.buffers;
-        var json_utf8 = (new TextEncoder('utf8')).encode(JSON.stringify(msg));
-        buffers.unshift(json_utf8);
-        var nbufs = buffers.length;
-        offsets.push(4 * (nbufs + 1));
-        for (i = 0; i + 1 < buffers.length; i++) {
-            offsets.push(offsets[offsets.length-1] + buffers[i].byteLength);
-        }
-        var msg_buf = new Uint8Array(
-            offsets[offsets.length-1] + buffers[buffers.length-1].byteLength
-        );
-        // use DataView.setUint32 for network byte-order
-        var view = new DataView(msg_buf.buffer);
-        // write nbufs to first 4 bytes
-        view.setUint32(0, nbufs);
-        // write offsets to next 4 * nbufs bytes
-        for (i = 0; i < offsets.length; i++) {
-            view.setUint32(4 * (i+1), offsets[i]);
-        }
-        // write all the buffers at their respective offsets
-        for (i = 0; i < buffers.length; i++) {
-            msg_buf.set(new Uint8Array(buffers[i]), offsets[i]);
-        }
-        
-        // return raw ArrayBuffer
-        return msg_buf.buffer;
-    };
-    
-    var serialize = function (msg) {
-        if (msg.buffers && msg.buffers.length) {
-            return _serialize_binary(msg);
-        } else {
-            return JSON.stringify(msg);
-        }
-    };
-    
-    var exports = {
-        deserialize : deserialize,
-        serialize: serialize
-    };
-    return exports;
-});
diff --git a/notebook/static/services/sessions/session.js b/notebook/static/services/sessions/session.js
deleted file mode 100644
index 1772ae1b3..000000000
--- a/notebook/static/services/sessions/session.js
+++ /dev/null
@@ -1,326 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'services/kernels/kernel',
-], function($, utils, kernel) {
-    "use strict";
-
-    /**
-     * Session object for accessing the session REST api. The session
-     * should be used to start kernels and then shut them down -- for
-     * all other operations, the kernel object should be used.
-     *
-     * Preliminary documentation for the REST API is at
-     * https://github.com/ipython/ipython/wiki/IPEP-16%3A-Notebook-multi-directory-dashboard-and-URL-mapping#sessions-api
-     *
-     * Options should include:
-     *  - notebook_path: the path (not including name) to the notebook
-     *  - kernel_name: the type of kernel (e.g. python3)
-     *  - base_url: the root url of the notebook server
-     *  - ws_url: the url to access websockets
-     *  - notebook: Notebook object
-     *
-     * @class Session
-     * @param {Object} options
-     */
-    var Session = function (options) {
-        this.id = null;
-        this.notebook_model = {
-            path: options.notebook_path
-        };
-        this.kernel_model = {
-            id: null,
-            name: options.kernel_name
-        };
-
-        this.base_url = options.base_url;
-        this.ws_url = options.ws_url;
-        this.session_service_url = utils.url_path_join(this.base_url, 'api/sessions');
-        this.session_url = null;
-
-        this.notebook = options.notebook;
-        this.kernel = null;
-        this.events = options.notebook.events;
-
-        this.bind_events();
-    };
-
-    Session.prototype.bind_events = function () {
-        var that = this;
-        var record_status = function (evt, info) {
-            console.log('Session: ' + evt.type + ' (' + info.session.id + ')');
-        };
-
-        this.events.on('kernel_created.Session', record_status);
-        this.events.on('kernel_dead.Session', record_status);
-        this.events.on('kernel_killed.Session', record_status);
-
-        // if the kernel dies, then also remove the session
-        this.events.on('kernel_dead.Kernel', function () {
-            that.delete();
-        });
-        this.events.on('kernel_failed_restart.Kernel', function () {
-            that.notebook.start_session();
-        });
-    };
-
-
-    // Public REST api functions
-
-    /**
-     * GET /api/sessions
-     *
-     * Get a list of the current sessions.
-     *
-     * @function list
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Session.prototype.list = function (success, error) {
-        utils.ajax(this.session_service_url, {
-            processData: false,
-            cache: false,
-            type: "GET",
-            dataType: "json",
-            success: success,
-            error: this._on_error(error)
-        });
-    };
-
-    /**
-     * POST /api/sessions
-     *
-     * Start a new session. This function can only executed once.
-     *
-     * @function start
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Session.prototype.start = function (success, error) {
-        var that = this;
-        var on_success = function (data, status, xhr) {
-            if (that.kernel) {
-                that.kernel.name = that.kernel_model.name;
-            } else {
-                var kernel_service_url = utils.url_path_join(that.base_url, "api/kernels");
-                that.kernel = new kernel.Kernel(kernel_service_url, that.ws_url, that.kernel_model.name);
-            }
-            that.events.trigger('kernel_created.Session', {session: that, kernel: that.kernel});
-            that.kernel._kernel_created(data.kernel);
-            if (success) {
-                success(data, status, xhr);
-            }
-        };
-        var on_error = function (xhr, status, err) {
-            that.events.trigger('kernel_dead.Session', {session: that, xhr: xhr, status: status, error: err});
-            if (error) {
-                error(xhr, status, err);
-            }
-        };
-
-        utils.ajax(this.session_service_url, {
-            processData: false,
-            cache: false,
-            type: "POST",
-            data: JSON.stringify(this._get_model()),
-            contentType: 'application/json',
-            dataType: "json",
-            success: this._on_success(on_success),
-            error: this._on_error(on_error)
-        });
-    };
-
-    /**
-     * GET /api/sessions/[:session_id]
-     *
-     * Get information about a session.
-     *
-     * @function get_info
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Session.prototype.get_info = function (success, error) {
-        utils.ajax(this.session_url, {
-            processData: false,
-            cache: false,
-            type: "GET",
-            dataType: "json",
-            success: this._on_success(success),
-            error: this._on_error(error)
-        });
-    };
-
-    /**
-     * PATCH /api/sessions/[:session_id]
-     *
-     * Rename or move a notebook. If the given name or path are
-     * undefined, then they will not be changed.
-     *
-     * @function rename_notebook
-     * @param {string} [path] - new notebook path
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Session.prototype.rename_notebook = function (path, success, error) {
-        if (path !== undefined) {
-            this.notebook_model.path = path;
-        }
-
-        utils.ajax(this.session_url, {
-            processData: false,
-            cache: false,
-            type: "PATCH",
-            data: JSON.stringify(this._get_model()),
-            contentType: 'application/json',
-            dataType: "json",
-            success: this._on_success(success),
-            error: this._on_error(error)
-        });
-    };
-
-    /**
-     * DELETE /api/sessions/[:session_id]
-     *
-     * Kill the kernel and shutdown the session.
-     *
-     * @function delete
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Session.prototype.delete = function (success, error) {
-        if (this.kernel && this.kernel.is_connected()) {
-            this.events.trigger('kernel_killed.Session', {session: this, kernel: this.kernel});
-            this.kernel._kernel_dead();
-        }
-
-        utils.ajax(this.session_url, {
-            processData: false,
-            cache: false,
-            type: "DELETE",
-            dataType: "json",
-            success: this._on_success(success),
-            error: this._on_error(error)
-        });
-    };
-
-    /**
-     * Restart the session by deleting it and the starting it
-     * fresh. If options are given, they can include any of the
-     * following:
-     *
-     * - notebook_path - the path to the notebook
-     * - kernel_name - the name (type) of the kernel
-     *
-     * @function restart
-     * @param {Object} [options] - options for the new kernel
-     * @param {function} [success] - function executed on ajax success
-     * @param {function} [error] - function executed on ajax error
-     */
-    Session.prototype.restart = function (options, success, error) {
-        var that = this;
-        var start = function () {
-            if (options && options.notebook_path) {
-                that.notebook_model.path = options.notebook_path;
-            }
-            if (options && options.kernel_name) {
-                that.kernel_model.name = options.kernel_name;
-            }
-            that.kernel_model.id = null;
-            that.start(success, error);
-        };
-        this.delete(start, start);
-    };
-
-    // Helper functions
-
-    /**
-     * Get the data model for the session, which includes the notebook path
-     * and kernel (name and id).
-     *
-     * @function _get_model
-     * @returns {Object} - the data model
-     */
-    Session.prototype._get_model = function () {
-        return {
-            path: this.notebook_model.path,
-            type: 'notebook',
-            name: '',
-            kernel: this.kernel_model
-        };
-    };
-
-    /**
-     * Update the data model from the given JSON object, which should
-     * have attributes of `id`, `notebook`, and/or `kernel`. If
-     * provided, the notebook data must include name and path, and the
-     * kernel data must include name and id.
-     *
-     * @function _update_model
-     * @param {Object} data - updated data model
-     */
-    Session.prototype._update_model = function (data) {
-        if (data && data.id) {
-            this.id = data.id;
-            this.session_url = utils.url_path_join(this.session_service_url, this.id);
-        }
-        if (data && data.notebook) {
-            this.notebook_model.path = data.path;
-        }
-        if (data && data.kernel) {
-            this.kernel_model.name = data.kernel.name;
-            this.kernel_model.id = data.kernel.id;
-        }
-    };
-
-    /**
-     * Handle a successful AJAX request by updating the session data
-     * model with the response, and then optionally calling a provided
-     * callback.
-     *
-     * @function _on_success
-     * @param {function} success - callback
-     */
-    Session.prototype._on_success = function (success) {
-        var that = this;
-        return function (data, status, xhr) {
-            that._update_model(data);
-            if (success) {
-                success(data, status, xhr);
-            }
-        };
-    };
-
-    /**
-     * Handle a failed AJAX request by logging the error message, and
-     * then optionally calling a provided callback.
-     *
-     * @function _on_error
-     * @param {function} error - callback
-     */
-    Session.prototype._on_error = function (error) {
-        return function (xhr, status, err) {
-            utils.log_ajax_error(xhr, status, err);
-            if (error) {
-                error(xhr, status, err);
-            }
-        };
-    };
-
-    /**
-     * Error type indicating that the session is already starting.
-     */
-    var SessionAlreadyStarting = function (message) {
-        this.name = "SessionAlreadyStarting";
-        this.message = (message || "");
-    };
-
-    SessionAlreadyStarting.prototype = Error.prototype;
-
-    return {
-        Session: Session,
-        SessionAlreadyStarting: SessionAlreadyStarting
-    };
-});
diff --git a/notebook/static/style/ipython.less b/notebook/static/style/ipython.less
deleted file mode 100644
index d09fa90a1..000000000
--- a/notebook/static/style/ipython.less
+++ /dev/null
@@ -1,12 +0,0 @@
-// minimal imports from bootstrap - only variables and mixins
-@import "../components/bootstrap/less/variables.less";
-@import "../components/bootstrap/less/mixins.less";
-
-// minimal imports from font-awesome
-@import "../components/font-awesome/less/variables.less";
-
-// base
-@import "../base/less/style.less";
-
-// notebook
-@import "../notebook/less/style_noapp.less";
diff --git a/notebook/static/style/style.less b/notebook/static/style/style.less
deleted file mode 100644
index a1bcfdb55..000000000
--- a/notebook/static/style/style.less
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
-*
-* Twitter Bootstrap
-*
-*/
-@import "../components/bootstrap/less/bootstrap.less";
-
-/*!
-*
-* Font Awesome
-*
-*/
-@import "../components/font-awesome/less/font-awesome.less";
-@fa-font-path:    "../components/font-awesome/fonts";
-
-// base
-@import "../base/less/style.less";
-@import "../base/less/page.less";
-
-// auth
-@import "../auth/less/style.less";
-
-// tree
-@import "../tree/less/style.less";
-
-// edit
-@import "../edit/less/style.less";
-
-// notebook
-@import "../notebook/less/style.less";
-@import "../notebook/less/commandpalette.less";
-@import "../notebook/less/searchandreplace.less";
-
-// terminal
-@import "../terminal/less/terminal.less";
-
-@import "../acc_overwrite.less";
diff --git a/notebook/static/terminal/css/override.css b/notebook/static/terminal/css/override.css
deleted file mode 100644
index 6d74111f7..000000000
--- a/notebook/static/terminal/css/override.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*This file contains any manual css for this page that needs to override the global styles.
-This is only required when different pages style the same element differently. This is just
-a hack to deal with our current css styles and no new styling should be added in this file.*/
-
-body {
-    overflow: hidden;
-}
diff --git a/notebook/static/terminal/js/main.js b/notebook/static/terminal/js/main.js
deleted file mode 100644
index 03ea2ab2e..000000000
--- a/notebook/static/terminal/js/main.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-requirejs([
-    'jquery',
-    'base/js/utils',
-    'base/js/page',
-    'auth/js/loginwidget',
-    'services/config',
-    'terminal/js/terminado',
-], function(
-    $,
-    utils,
-    page,
-    loginwidget,
-    configmod,
-    terminado
-    ){
-    "use strict";
-    requirejs(['custom/custom'], function() {});
-    page = new page.Page('div#header', 'div#site');
-
-    var common_options = {
-        base_url : utils.get_body_data("baseUrl"),
-    };
-
-    var config = new configmod.ConfigSection('terminal', common_options);
-    config.load();
-    var common_config = new configmod.ConfigSection('common', common_options);
-    common_config.load();
-
-    // This makes the 'logout' button in the top right work.
-    var login_widget = new loginwidget.LoginWidget('span#login_widget', common_options);
-
-    var base_url = utils.get_body_data('baseUrl').replace(/\/?$/, '/');
-    var ws_path = utils.get_body_data('wsPath');
-    var ws_url = utils.get_body_data('wsUrl');
-    if (!ws_url) {
-        // trailing 's' in https will become wss for secure web sockets
-        ws_url = location.protocol.replace('http', 'ws') + "//" + location.host;
-    }
-    ws_url = ws_url + base_url + ws_path;
-    
-    page.show_header();
-    
-    var terminal = terminado.make_terminal($("#terminado-container")[0], ws_url);
-    
-    page.show_site();
-    
-    utils.load_extensions_from_config(config);
-    utils.load_extensions_from_config(common_config);
-    
-    window.onresize = function() {
-      terminal.term.fit();
-      // send the new size to the server so that it can trigger a resize in the running process.
-      terminal.socket.send(JSON.stringify(["set_size", terminal.term.rows, terminal.term.cols,
-                                    $(window).height(), $(window).width()]));
-    };
-
-    // Expose terminal for fiddling with in the browser
-    window.terminal = terminal;
-
-});
diff --git a/notebook/static/terminal/js/terminado.js b/notebook/static/terminal/js/terminado.js
deleted file mode 100644
index 3e52d11d6..000000000
--- a/notebook/static/terminal/js/terminado.js
+++ /dev/null
@@ -1,38 +0,0 @@
-define (["xterm", "xtermjs-fit"], function(Terminal, fit) {
-    "use strict";
-    function make_terminal(element, ws_url) {
-        var ws = new WebSocket(ws_url);
-        Terminal.applyAddon(fit);
-        var term = new Terminal();
-        ws.onopen = function(event) {
-            term.on('data', function(data) {
-                ws.send(JSON.stringify(['stdin', data]));
-            });
-            
-            term.on('title', function(title) {
-                document.title = title;
-            });
-            
-            term.open(element);
-            term.fit();
-            // send the terminal size to the server.
-            ws.send(JSON.stringify(["set_size", term.rows, term.cols,
-                                        window.innerHeight, window.innerWidth]));
-
-            ws.onmessage = function(event) {
-                var json_msg = JSON.parse(event.data);
-                switch(json_msg[0]) {
-                    case "stdout":
-                        term.write(json_msg[1]);
-                        break;
-                    case "disconnect":
-                        term.write("\r\n\r\n[CLOSED]\r\n");
-                        break;
-                }
-            };
-        };
-        return {socket: ws, term: term};
-    }
-
-    return {make_terminal: make_terminal};
-});
diff --git a/notebook/static/terminal/less/terminal.less b/notebook/static/terminal/less/terminal.less
deleted file mode 100644
index fa5117e37..000000000
--- a/notebook/static/terminal/less/terminal.less
+++ /dev/null
@@ -1,39 +0,0 @@
-.terminal-app {
-  background: @page-backdrop-color;
-
-  #header {
-    background: @body-bg;
-    .box-shadow(@global-shadow);
-  }
-
-  .terminal {
-    width: 100%;
-    float: left;
-    font-family: monospace;
-    color: white;
-    background: black;
-    padding: @code_padding;
-    border-radius: @border-radius-base;
-    .box-shadow(@global-shadow-dark);
-    line-height: 1em;
-    font-size: @notebook_font_size;
-
-    .xterm-rows {
-      padding: 10px;
-    }
-  }
-
-  .terminal-cursor {
-    color: black;
-    background: white;
-  }
-
-  .terminado-container-container {
-    padding-top: @page-header-padding;
-    height: 100%;
-  }
-
-  #terminado-container {
-    height: 100%;
-  }
-}
diff --git a/notebook/static/tree/js/kernellist.js b/notebook/static/tree/js/kernellist.js
deleted file mode 100644
index e3a7ddc9f..000000000
--- a/notebook/static/tree/js/kernellist.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'tree/js/notebooklist',
-    'base/js/i18n'
-], function($, IPython, notebooklist, i18n) {
-    "use strict";
-    
-    var KernelList = function (selector, options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  selector: string
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          session_list: SessionList instance
-         *          base_url: string
-         *          notebook_path: string
-         */
-        notebooklist.NotebookList.call(this, selector, $.extend({
-            element_name: 'running'},
-            options));
-        this.kernelspecs = this.sessions = null;
-        this.events.on('kernelspecs_loaded.KernelSpec', $.proxy(this._kernelspecs_loaded, this));
-    };
-
-    KernelList.prototype = Object.create(notebooklist.NotebookList.prototype);
-
-    KernelList.prototype.add_duplicate_button = function () {
-        /**
-         * do nothing
-         */
-    };
-    
-    KernelList.prototype._kernelspecs_loaded = function (event, kernelspecs) {
-        this.kernelspecs = kernelspecs;
-        if (this.sessions) {
-            // trigger delayed session load, since kernelspecs arrived later
-            this.sessions_loaded(this.sessions);
-        }
-    };
-    
-    KernelList.prototype.sessions_loaded = function (d) {
-        this.sessions = d;
-        if (!this.kernelspecs) {
-            return; // wait for kernelspecs before first load
-        }
-        this.clear_list();
-        var item, path, session, info;
-        for (path in d) {
-            if (!d.hasOwnProperty(path)) {
-                // nothing is safe in javascript
-                continue;
-            }
-            session = d[path];
-            item = this.new_item(-1);
-            info = this.kernelspecs[session.kernel.name];
-            this.add_link({
-                name: path,
-                path: path,
-                type: 'notebook',
-                kernel_display_name: (info && info.spec) ? info.spec.display_name : session.kernel.name
-            }, item);
-        }
-        $('#running_list_placeholder').toggle($.isEmptyObject(d));
-    };
-
-    KernelList.prototype.add_link = function (model, item) {
-        notebooklist.NotebookList.prototype.add_link.apply(this, [model, item]);
-
-        var running_indicator = item.find(".item_buttons")
-            .text('');
-
-        var that = this;
-        var kernel_name = $('<div/>')
-            .addClass('kernel-name')
-            .text(model.kernel_display_name)
-            .appendTo(running_indicator);
-
-        var shutdown_button = $('<button/>')
-            .addClass('btn btn-warning btn-xs')
-            .text(i18n._('Shutdown'))
-            .click(function() {
-                var parent = $(this).parent().parent().parent();
-                var path = parent.data('path');
-                if(!path) {
-                  path = parent.parent().data('path');
-                }
-                if(!path) {
-                  throw new Error("Shutdown path not present");
-                }
-                that.shutdown_notebook(path);
-            })
-            .appendTo(running_indicator);
-    };
-    
-    // Backwards compatibility.
-    IPython.KernelList = KernelList;
-
-    return {'KernelList': KernelList};
-});
diff --git a/notebook/static/tree/js/main.js b/notebook/static/tree/js/main.js
deleted file mode 100644
index d1952d60e..000000000
--- a/notebook/static/tree/js/main.js
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-// adapted from Mozilla Developer Network example at
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function/bind
-// shim `bind` for testing under casper.js
-var bind = function bind(obj) {
-  var slice = [].slice;
-  var args = slice.call(arguments, 1),
-    self = this,
-    nop = function() {
-    },
-    bound = function() {
-      return self.apply(this instanceof nop ? this : (obj || {}), args.concat(slice.call(arguments)));
-    };
-  nop.prototype = this.prototype || {}; // Firefox cries sometimes if prototype is undefined
-  bound.prototype = new nop();
-  return bound;
-};
-Function.prototype.bind = Function.prototype.bind || bind ;
-
-
-requirejs([
-    'jquery',
-    'contents',
-    'base/js/namespace',
-    'base/js/dialog',
-    'base/js/events',
-    'base/js/promises',
-    'base/js/page',
-    'base/js/utils',
-    'services/config',
-    'tree/js/notebooklist',
-    'tree/js/sessionlist',
-    'tree/js/kernellist',
-    'tree/js/terminallist',
-    'tree/js/newnotebook',
-    'tree/js/shutdownbutton',
-    'auth/js/loginwidget',
-    'bidi/bidi',
-], function(
-    $,
-    contents_service,
-    IPython,
-    dialog,
-    events,
-    promises,
-    page,
-    utils,
-    config,
-    notebooklist,
-    sesssionlist,
-    kernellist,
-    terminallist,
-    newnotebook,
-    shutdownbutton,
-    loginwidget,
-    bidi){
-    "use strict";
-    
-    try{
-        requirejs(['custom/custom'], function() {});
-        bidi.loadLocale();
-    } catch(err) {
-        console.log("Error loading custom.js from tree service. Continuing and logging");
-        console.warn(err);
-    }
-
-    console.log('Welcome to Project Jupyter! Explore the various tools available and their corresponding documentation. If you are interested in contributing to the platform, please visit the community resources section at http://jupyter.org/community.html.');
-
-
-    // Setup all of the config related things
-
-    var common_options = {
-        base_url: utils.get_body_data("baseUrl"),
-        notebook_path: utils.get_body_data("notebookPath"),
-    };
-    var cfg = new config.ConfigSection('tree', common_options);
-    cfg.load();
-    common_options.config = cfg;
-    var common_config = new config.ConfigSection('common', common_options);
-    common_config.load();
-
-    // Instantiate the main objects
-
-    page = new page.Page('div#header', 'div#site');
-
-    var session_list = new sesssionlist.SesssionList($.extend({
-        events: events},
-        common_options));
-    var contents = new contents_service.Contents({
-        base_url: common_options.base_url,
-        common_config: common_config
-    });
-    IPython.NotebookList = notebooklist.NotebookList;
-    var notebook_list = new notebooklist.NotebookList('#notebook_list', $.extend({
-        contents: contents,
-        session_list:  session_list},
-        common_options));
-    var kernel_list = new kernellist.KernelList('#running_list',  $.extend({
-        session_list:  session_list},
-        common_options));
-    
-    var terminal_list;
-    if (utils.get_body_data("terminalsAvailable") === "True") {
-        terminal_list = new terminallist.TerminalList('#terminal_list', common_options);
-    }
-
-    var login_widget = new loginwidget.LoginWidget('#login_widget', common_options);
-
-    var new_buttons = new newnotebook.NewNotebookWidget("#new-buttons",
-        $.extend(
-            {contents: contents, events: events},
-            common_options
-        )
-    );
-
-    var interval_id=0;
-    // auto refresh every xx secondes, no need to be fast,
-    //  update is done most of the time when page get focus
-    IPython.tree_time_refresh = 60; // in sec
-
-    // limit refresh on focus at 1/10sec, otherwise this
-    // can cause too frequent refresh on switching through windows or tabs.
-    IPython.min_delta_refresh = 10; // in sec
-
-    var _last_refresh = null;
-
-    var _refresh_list = function(){
-        _last_refresh = new Date();
-        session_list.load_sessions();
-        if (terminal_list) {
-            terminal_list.load_terminals();
-        }
-    };
-
-    var enable_autorefresh = function(){
-        /**
-         *refresh immediately , then start interval
-         */
-        var now = new Date();
-
-        if (now - _last_refresh < IPython.min_delta_refresh*1000){
-            console.log("Reenabling autorefresh too close to last tree refresh, not refreshing immediately again.");
-        } else {
-            _refresh_list();
-        }
-        if (!interval_id){
-            interval_id = setInterval(_refresh_list,
-                    IPython.tree_time_refresh*1000
-            );
-        }
-    };
-
-    var disable_autorefresh = function(){
-        clearInterval(interval_id);
-        interval_id = 0;
-    };
-
-    // stop autorefresh when page lose focus
-    $(window).blur(function() {
-        disable_autorefresh();
-    });
-
-    //re-enable when page get focus back
-    $(window).focus(function() {
-        enable_autorefresh();
-    });
-
-    // finally start it, it will refresh immediately
-    enable_autorefresh();
-
-    page.show();
-
-    // For backwards compatibility.
-    IPython.page = page;
-    IPython.notebook_list = notebook_list;
-    IPython.session_list = session_list;
-    IPython.kernel_list = kernel_list;
-    IPython.login_widget = login_widget;
-    IPython.new_notebook_widget = new_buttons;
-
-    events.trigger('app_initialized.DashboardApp');
-    
-    // Now actually load nbextensions
-    utils.load_extensions_from_config(cfg);
-    utils.load_extensions_from_config(common_config);
-    
-    // bound the upload method to the on change of the file select list
-    $("#alternate_upload").change(function (event){
-        notebook_list.handleFilesUpload(event,'form');
-    });
-
-    // bound the the span around the input file upload to enable keyboard click
-    $("#upload_span").keydown(function (event) {
-        var key = event.which;
-        if ((key === 13) || (key === 32)) {
-            event.preventDefault();
-            $("#upload_span_input").click();
-        }
-    })
-    
-    // set hash on tab click
-    $("#tabs").find("a").click(function(e) {
-        // Prevent the document from jumping when the active tab is changed to a 
-        // tab that has a lot of content.
-        e.preventDefault();
-
-        // Set the hash without causing the page to jump.
-        // https://stackoverflow.com/a/14690177/2824256
-        var hash = $(this).attr("href");
-        if(window.history.pushState) {
-            window.history.pushState(null, null, hash);
-        } else {
-            window.location.hash = hash;
-        }
-    });
-    
-    // load tab if url hash
-    if (window.location.hash) {
-        $("#tabs").find("a[href='" + window.location.hash + "']").click();
-    }
-    
-    shutdownbutton.activate();
-});
diff --git a/notebook/static/tree/js/newnotebook.js b/notebook/static/tree/js/newnotebook.js
deleted file mode 100644
index f20c02d77..000000000
--- a/notebook/static/tree/js/newnotebook.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/dialog',
-], function ($, IPython, utils, i18n, dialog) {
-    "use strict";
-    
-    var NewNotebookWidget = function (selector, options) {
-        this.selector = selector;
-        this.base_url = options.base_url;
-        this.contents = options.contents;
-        this.events = options.events;
-        this.default_kernel = null;
-        this.kernelspecs = {};
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.request_kernelspecs();
-        }
-        this.bind_events();
-    };
-    
-    NewNotebookWidget.prototype.bind_events = function () {
-        var that = this;
-        this.element.find('#new_notebook').click(function () {
-            that.new_notebook();
-        });
-    };
-    
-    NewNotebookWidget.prototype.request_kernelspecs = function () {
-        /** request and then load kernel specs */
-        var url = utils.url_path_join(this.base_url, 'api/kernelspecs');
-        utils.promising_ajax(url).then($.proxy(this._load_kernelspecs, this));
-    };
-    
-    NewNotebookWidget.prototype._load_kernelspecs = function (data) {
-        /** load kernelspec list */
-        var that = this;
-        this.kernelspecs = data.kernelspecs;
-        var menu = this.element.find("#notebook-kernels");
-        var keys = Object.keys(data.kernelspecs).sort(function (a, b) {
-            var da = data.kernelspecs[a].spec.display_name;
-            var db = data.kernelspecs[b].spec.display_name;
-            if (da === db) {
-                return 0;
-            } else if (da > db) {
-                return 1;
-            } else {
-                return -1;
-            }
-        });
-
-        // Create the kernel list in reverse order because
-        // the .after insertion causes each item to be added
-        // to the top of the list.
-        for (var i = keys.length - 1; i >= 0; i--) {
-            var ks = this.kernelspecs[keys[i]];
-            var li = $("<li>")
-                .attr("id", "kernel-" +ks.name)
-                .data('kernelspec', ks).append(
-                    $('<a>')
-                        .attr("aria-label", ks.name)
-                        .attr("role", "menuitem")
-                        .attr('href', '#')
-                        .click($.proxy(this.new_notebook, this, ks.name))
-                        .text(ks.spec.display_name)
-                        .attr('title', i18n.sprintf(i18n._('Create a new notebook with %s'), ks.spec.display_name))
-                );
-            menu.after(li);
-        }
-        this.events.trigger('kernelspecs_loaded.KernelSpec', data.kernelspecs);
-    };
-    
-    NewNotebookWidget.prototype.new_notebook = function (kernel_name, evt) {
-        /** create and open a new notebook */
-        var that = this;
-        kernel_name = kernel_name || this.default_kernel;
-        var w = window.open(undefined, IPython._target);
-        var dir_path = $('body').attr('data-notebook-path');
-        this.contents.new_untitled(dir_path, {type: "notebook"}).then(
-            function (data) {
-                var url = utils.url_path_join(
-                    that.base_url, 'notebooks',
-                    utils.encode_uri_components(data.path)
-                );
-                if (kernel_name) {
-                    url += "?kernel_name=" + kernel_name;
-                }
-                w.location = url;
-        }).catch(function (e) {
-            w.close();
-            // This statement is used simply so that message extraction
-            // will pick up the strings.  The actual setting of the text
-            // for the button is in dialog.js.
-            var button_labels = [ i18n._("OK")];
-            dialog.modal({
-                title : i18n._('Creating Notebook Failed'),
-                body : $('<div/>')
-                    .text(i18n._("An error occurred while creating a new notebook."))
-                    .append($('<div/>')
-                        .addClass('alert alert-danger')
-                        .text(e.message || e)),
-                buttons: {
-                    OK: {'class' : 'btn-primary'}
-                }
-            });
-        });
-        if (evt !== undefined) {
-            evt.preventDefault();
-        }
-    };
-    
-    return {'NewNotebookWidget': NewNotebookWidget};
-});
diff --git a/notebook/static/tree/js/notebooklist.js b/notebook/static/tree/js/notebooklist.js
deleted file mode 100644
index 3f1f96a28..000000000
--- a/notebook/static/tree/js/notebooklist.js
+++ /dev/null
@@ -1,1624 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'base/js/utils',
-    'base/js/i18n',
-    'base/js/dialog',
-    'base/js/events',
-    'base/js/keyboard',
-    'moment',
-    'bidi/bidi',
-    'components/marked/lib/marked'
-], function($, IPython, utils, i18n, dialog, events, keyboard, moment, bidi, marked) {
-    "use strict";
-
-    var extension = function(path){
-      /**
-       *  return the last pat after the dot in a filepath
-       *  or the filepath itself if no dots present.
-       *  Empty string if the filepath ends with a dot.
-       **/
-      var parts = path.split('.');
-      return parts[parts.length-1];
-    };
-
-    var item_in = function(item, list) {
-      // Normalize list and item to lowercase
-      var normalized_list = list.map(function(_item) {
-        return _item.toLowerCase();
-      });
-      return normalized_list.indexOf(item.toLowerCase()) !== -1;
-    };
-
-    var includes_extension = function(filepath, extensionslist) {
-      return item_in(extension(filepath), extensionslist);
-    };
-
-    function name_sorter(ascending) {
-        return (function(a, b) {
-            if (type_order[a['type']] < type_order[b['type']]) {
-                return -1;
-            }
-            if (type_order[a['type']] > type_order[b['type']]) {
-                return 1;
-            }
-            if (a['name'].toLowerCase() < b['name'].toLowerCase()) {
-                return (ascending) ? -1 : 1;
-            }
-            if (a['name'].toLowerCase() > b['name'].toLowerCase()) {
-                return (ascending) ? 1 : -1;
-            }
-            return 0;
-        });
-    }
-
-    function modified_sorter(ascending) {
-        var order = ascending ? 1 : 0;
-        return (function(a, b) {
-            return utils.datetime_sort_helper(a.last_modified, b.last_modified,
-                                              order)
-        });
-    }
-
-    function size_sorter(ascending) {
-        var order = ascending ? 1 : 0;
-        // directories have file size of undefined
-        return (function(a, b) {
-          if (a.size === undefined) {
-             return (ascending) ? -1 : 1;
-          }
-
-          if (b.size === undefined) {
-             return (ascending) ? 1 : -1;
-          }
-
-          if (a.size > b.size) {
-            return (ascending) ? -1 : 1;
-          }
-
-          if (b.size > a.size) {
-            return (ascending) ? 1 : -1;
-          }
-
-          return 0;
-        });
-    }
-
-    var sort_functions = {
-        'sort-name': name_sorter,
-        'last-modified': modified_sorter,
-        'file-size': size_sorter
-    };
-
-    var NotebookList = function (selector, options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  selector: string
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          session_list: SessionList instance
-         *          element_name: string
-         *          base_url: string
-         *          notebook_path: string
-         *          contents: Contents instance
-         */
-        var that = this;
-        this.session_list = options.session_list;
-        this.events = this.session_list.events;
-        // allow code re-use by just changing element_name in kernellist.js
-        this.element_name = options.element_name || 'notebook';
-        this.selector = selector;
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.style();
-            this.bind_events();
-        }
-        this.notebooks_list = [];
-        this.sessions = {};
-        this.base_url = options.base_url || utils.get_body_data("baseUrl");
-        this.notebook_path = options.notebook_path || utils.get_body_data("notebookPath");
-        this.initial_notebook_path = this.notebook_path;
-        this.contents = options.contents;
-        if (this.session_list && this.session_list.events) {
-            this.session_list.events.on('sessions_loaded.Dashboard',
-                function(e, d) { that.sessions_loaded(d); });
-        }
-        this.selected = [];
-        this.sort_function = name_sorter(1);
-        // 0 => descending, 1 => ascending
-        this.sort_id = 'sort-name';
-        this.sort_direction = 1;
-        this._max_upload_size_mb = 25;
-        this.EDIT_MIMETYPES = [
-          'application/javascript',
-          'application/x-sh',
-          'application/vnd.groove-tool-template'
-        ];
-    };
-
-    NotebookList.prototype.style = function () {
-        var prefix = '#' + this.element_name;
-        $(prefix + '_toolbar').addClass('list_toolbar');
-        $(prefix + '_list_info').addClass('toolbar_info');
-        $(prefix + '_buttons').addClass('toolbar_buttons');
-        $(prefix + '_list_header').addClass('list_header');
-        this.element.addClass("list_container");
-    };
-
-    NotebookList.prototype.bind_events = function () {
-        var that = this;
-        $('#refresh_' + this.element_name + '_list').click(function () {
-            that.load_sessions();
-        });
-        this.element.bind('dragover', function () {
-            return false;
-        });
-        this.element.bind('drop', function(event){
-            that.handleFilesUpload(event,'drop');
-            return false;
-        });
-
-        // Bind events for singleton controls.
-        if (!NotebookList._bound_singletons) {
-            NotebookList._bound_singletons = true;
-            $('#new-file').click(function(e) {
-                var w = window.open('', IPython._target);
-                that.contents.new_untitled(that.notebook_path || '', {type: 'file', ext: '.txt'}).then(function(data) {
-                    w.location = utils.url_path_join(
-                        that.base_url, 'edit',
-                        utils.encode_uri_components(data.path)
-                    );
-                }).catch(function (e) {
-                    w.close();
-                    dialog.modal({
-                        title: i18n.msg._('Creating File Failed'),
-                        body: $('<div/>')
-                            .text(i18n.msg._("An error occurred while creating a new file."))
-                            .append($('<div/>')
-                                .addClass('alert alert-danger')
-                                .text(e.message || e)),
-                        buttons: {
-                            OK: {'class': 'btn-primary'}
-                        }
-                    });
-                    console.warn('Error during New file creation', e);
-                });
-                that.load_sessions();
-                e.preventDefault();
-            });
-            $('#new-folder').click(function(e) {
-                that.contents.new_untitled(that.notebook_path || '', {type: 'directory'})
-                .then(function(){
-                    that.load_list();
-                }).catch(function (e) {
-                    dialog.modal({
-                        title: i18n.msg._('Creating Folder Failed'),
-                        body: $('<div/>')
-                            .text(i18n.msg._("An error occurred while creating a new folder."))
-                            .append($('<div/>')
-                                .addClass('alert alert-danger')
-                                .text(e.message || e)),
-                        buttons: {
-                            OK: {'class': 'btn-primary'}
-                        }
-                    });
-                    console.warn('Error during New directory creation', e);
-                });
-                that.load_sessions();
-                e.preventDefault();
-            });
-
-            // Bind events for action buttons.
-            $('.rename-button').click($.proxy(this.rename_selected, this));
-            $('.move-button').click($.proxy(this.move_selected, this));
-            $('.download-button').click($.proxy(this.download_selected, this));
-            $('.shutdown-button').click($.proxy(this.shutdown_selected, this));
-            $('.duplicate-button').click($.proxy(this.duplicate_selected, this));
-            $('.view-button').click($.proxy(this.view_selected, this));
-            $('.edit-button').click($.proxy(this.edit_selected, this));
-            $('.delete-button').click($.proxy(this.delete_selected, this));
-
-            // Bind events for selection menu buttons.
-            $('#selector-menu').click(function (event) {
-                that.select($(event.target).attr('id'));
-            });
-            var select_all = $('#select-all');
-            select_all.change(function () {
-                if (!select_all.prop('checked') || select_all.data('indeterminate')) {
-                    that.select('select-none');
-                } else {
-                    that.select('select-all');
-                }
-            });
-
-            $('#button-select-all').click(function (e) {
-                // toggle checkbox if the click doesn't come from the checkbox already
-                if (!$(e.target).is('input[type=checkbox]')) {
-                    if (select_all.prop('checked') || select_all.data('indeterminate')) {
-                        that.select('select-none');
-                    } else {
-                        that.select('select-all');
-                    }
-                }
-            });
-
-            $('.sort-action').click(function(e) {
-                var sort_on = e.target.id;
-
-                // Clear sort indications in UI
-                $(".sort-action i").removeClass("fa-arrow-up").removeClass("fa-arrow-down");
-
-                if ((that.sort_id === sort_on) && (that.sort_direction === 1)) {
-                    that.sort_list(sort_on, 0);
-                    $("#" + sort_on + " i").addClass("fa-arrow-up");
-                    that.sort_direction = 0;
-                } else {
-                    that.sort_list(sort_on, 1);
-                    $("#" + sort_on + " i").addClass("fa-arrow-down");
-                    that.sort_direction = 1;
-                }
-                that.sort_id = sort_on;
-            });
-        }
-    };
-
-    NotebookList.prototype.sort_list = function(id, order) {
-        if (sort_functions.hasOwnProperty(id)) {
-            this.sort_function = sort_functions[id](order);
-            this.draw_notebook_list(this.model_list, this.error_msg);
-        } else {
-            console.error("No such sort id: '" + id + "'")
-        }
-    };
-
-    NotebookList.prototype.handleFilesUpload =  function(event, dropOrForm) {
-        var that = this;
-        var files;
-        if(dropOrForm === 'drop'){
-            files = event.originalEvent.dataTransfer.files;
-        } else  {
-            files = event.originalEvent.target.files;
-        }
-
-        var reader_onload = function (event) {
-            var item = $(event.target).data('item');
-            that.add_file_data(event.target.result, item);
-            that.add_upload_button(item);
-        };
-        var reader_onerror = function (event) {
-            var item = $(event.target).data('item');
-            var name = item.data('name');
-            item.remove();
-            dialog.modal({
-                title : i18n.msg._('Failed to read file'),
-                body : i18n.msg.sprintf(i18n.msg._("Failed to read file %s"),name),
-                buttons : {'OK' : { 'class' : 'btn-primary' }}
-            });
-        };
-
-        Array.from(files).forEach(function(f) {
-            var name_and_ext = utils.splitext(f.name);
-            var file_ext = name_and_ext[1];
-
-            if (f.size > that._max_upload_size_mb * 1024 * 1024) {
-            	var body_msg = i18n.msg.sprintf(i18n.msg._("The file size is %d MB. Do you still want to upload it?"),
-            			Math.round(f.size / (1024 * 1024)));
-                dialog.modal({
-                    title : i18n.msg._('Large file size warning'),
-                    body : body_msg,
-                    buttons : {
-                        Cancel: {},
-                        Ok: {
-                            class: "btn-primary",
-                            click: function() {
-                                that.add_large_file_upload_button(f);
-                            }
-                        }
-                    }
-                });
-            }
-            else{
-                var reader = new FileReader();
-                if (file_ext === '.ipynb') {
-                    reader.readAsText(f);
-                } else {
-                    // read non-notebook files as binary
-                    reader.readAsArrayBuffer(f);
-                }
-                var item = that.new_item(0, true);
-                item.addClass('new-file');
-                that.add_name_input(f.name, item, file_ext === '.ipynb' ? 'notebook' : 'file');
-                // Store the list item in the reader so we can use it later
-                // to know which item it belongs to.
-                $(reader).data('item', item);
-                reader.onload = reader_onload;
-                reader.onerror = reader_onerror;
-            }
-        });
-        // Clear fileinput value. This is required to
-        // reset the form. Otherwise, if you upload a file, delete it and try to
-        // upload it again, the changed event won't fire.
-        var form = $('input.fileinput');
-        form.val('');
-        return false;
-    };
-
-    NotebookList.prototype.clear_list = function (remove_uploads) {
-        /**
-         * Clears the navigation tree.
-         *
-         * Parameters
-         * remove_uploads: bool=False
-         *      Should upload prompts also be removed from the tree.
-         */
-        if (remove_uploads) {
-            this.element.children('.list_item').remove();
-        } else {
-            this.element.children('.list_item:not(.new-file)').remove();
-        }
-    };
-
-    NotebookList.prototype.load_sessions = function(){
-        this.session_list.load_sessions();
-    };
-
-
-    NotebookList.prototype.sessions_loaded = function(data){
-        this.sessions = data;
-        this.load_list();
-    };
-
-    NotebookList.prototype.load_list = function () {
-        var that = this;
-        // Add an event handler browser back and forward events
-        window.onpopstate = function(e) {
-            var path = (window.history.state && window.history.state.path) ?
-                    window.history.state.path : that.initial_notebook_path;
-            that.update_location(path);
-        };
-        var breadcrumb = $('.breadcrumb');
-        breadcrumb.empty();
-        var list_item = $('<li/>');
-        var root_url = utils.url_path_join(that.base_url, '/tree');
-        var root = $('<li/>').append(
-            $("<a/>")
-            .attr('href', root_url)
-            .attr('title', i18n.msg._('Link to root folder'))
-            .append(
-                $("<i/>")
-                .addClass('fa fa-folder')
-            )
-            .click(function(e) {
-                // Allow the default browser action when the user holds a modifier (e.g., Ctrl-Click)
-                if(e.altKey || e.metaKey || e.shiftKey) {
-                    return true;
-                }
-                var path = '';
-                window.history.pushState(
-                    {path: path},
-                    'Home',
-                    utils.url_path_join(that.base_url, 'tree')
-                );
-                that.update_location(path);
-                return false;
-            })
-        );
-        breadcrumb.append(root);
-        var path_parts = [];
-        this.notebook_path.split('/').forEach(function(path_part) {
-            path_parts.push(path_part);
-            var path = path_parts.join('/');
-            var url = utils.url_path_join(
-                that.base_url,
-                '/tree',
-                utils.encode_uri_components(path)
-            );
-            var crumb = $('<li/>').append(
-                $('<a/>')
-                .attr('href', url)
-                .text(path_part)
-                .click(function(e) {
-                    // Allow the default browser action when the user holds a modifier (e.g., Ctrl-Click)
-                    if(e.altKey || e.metaKey || e.shiftKey) {
-                        return true;
-                    }
-                    window.history.pushState(
-                        {path: path},
-                        path,
-                        url
-                    );
-                    that.update_location(path);
-                    return false;
-                })
-            );
-            breadcrumb.append(crumb);
-        });
-        this.contents.list_contents(that.notebook_path).then(
-            $.proxy(this.draw_notebook_list, this),
-            function(error) {
-                that.draw_notebook_list({content: []}, i18n.msg._("Server error: ") + error.message);
-            }
-        );
-    };
-
-    NotebookList.prototype.update_location = function (path) {
-        this.notebook_path = path;
-        $('body').attr('data-notebook-path', path);
-        // Update the file tree list without reloading the page
-        this.load_list();
-        // Update the page title so the browser tab reflects it
-        // Match how the title appears with a trailing slash or
-        // "Home" if the page loads from the server.
-        $('title').text(path ? path+'/' : i18n.msg._("Home"));
-    };
-
-    /**
-     * Draw the list of notebooks
-     * @method draw_notebook_list
-     * @param {Array} list An array of dictionaries representing files or
-     *     directories.
-     * @param {String} error_msg An error message
-     */
-
-
-    var type_order = {'directory':0,'notebook':1,'file':2};
-
-    NotebookList.prototype.draw_notebook_list = function (list, error_msg) {
-        // Remember what was selected before the refresh.
-        var selected_before = this.selected;
-
-        // Store the data to be redrawn by sorting
-        this.model_list = list;
-        this.error_msg = error_msg;
-
-        list.content.sort(this.sort_function);
-        var message = error_msg || i18n.msg._('The notebook list is empty.');
-        var item = null;
-        var model = null;
-        var len = list.content.length;
-        this.clear_list();
-        var n_uploads = this.element.children('.list_item').length;
-        if (len === 0) {
-            item = this.new_item(0);
-            var span12 = item.children().first();
-            span12.empty();
-            span12.append($('<div style="margin:auto;text-align:center;color:grey"/>').text(message));
-        }
-        var path = this.notebook_path;
-        var offset = n_uploads;
-        if (path !== '') {
-            item = this.new_item(offset, false);
-            model = {
-                type: 'directory',
-                name: '..',
-                path: utils.url_path_split(path)[0]
-            };
-            this.add_link(model, item);
-            offset += 1;
-        }
-        for (var i=0; i<len; i++) {
-            model = list.content[i];
-            item = this.new_item(i+offset, true);
-            try {
-                this.add_link(model, item);
-            } catch(err) {
-                console.log('Error adding link: ' + err);
-            }
-        }
-        this.add_header_footer(list)
-        // Trigger an event when we've finished drawing the notebook list.
-        events.trigger('draw_notebook_list.NotebookList');
-
-        // Reselect the items that were selected before.  Notify listeners
-        // that the selected items may have changed.  O(n^2) operation.
-        selected_before.forEach(function(item) {
-            var list_items = $('.list_item');
-            for (var i=0; i<list_items.length; i++) {
-                var $list_item = $(list_items[i]);
-                if ($list_item.data('path') === item.path) {
-                    $list_item.find('input[type=checkbox]').prop('checked', true);
-                    break;
-                }
-            }
-        });
-        this._selection_changed();
-    };
-
-
-    /**
-     * Adds header and/or footer
-     * @param  {Array} list - list of folder contents
-     */
-    NotebookList.prototype.add_header_footer = function (list) {
-      var that = this;
-      function create_markdown_row(index, list_item) {
-	var item = that.new_item(index);
-	var span12 = item.children().first();
-	span12.empty();
-	that.contents.get(list_item.path, {"content": true}).then(
-          function (data) {
-	    span12.append($('<div style="margin:auto;text-align:center;color:grey"/>').innerHTML = marked(data.content));
-	  },
-          function(error) {
-            span12.append(i18n.msg._("Server error: ") + error.message);
-	  });
-      };
-      var f = list.content.find(function (el) {return el.name == "header.md"})
-      if (f !== undefined) {
-	create_markdown_row(0, f)
-      }
-      var f = list.content.find(function (el) {return el.name == "footer.md"})
-      if (f !== undefined) {
-	create_markdown_row(-1, f)
-      }
-    }
-
-
-    /**
-     * Creates a new item.
-     * @param  {integer} index
-     * @param  {boolean} [selectable] - tristate, undefined: don't draw checkbox,
-     *                                  false: don't draw checkbox but pad
-     *                                  where it should be, true: draw checkbox.
-     * @return {JQuery} row
-     */
-    NotebookList.prototype.new_item = function (index, selectable) {
-        var row = $('<div/>')
-            .addClass("list_item")
-            .addClass("row");
-
-        var item = $("<div/>")
-            .addClass("col-md-12")
-            .appendTo(row);
-
-        var checkbox;
-        if (selectable !== undefined) {
-            checkbox = $('<input/>')
-                .attr('type', 'checkbox')
-                .attr('title', i18n.msg._('Click here to rename, delete, etc.'))
-                .appendTo(item);
-        }
-
-        $('<i/>')
-            .addClass('item_icon')
-            .appendTo(item);
-
-        var link = $("<a/>")
-            .addClass("item_link")
-            .appendTo(item);
-
-        $("<span/>")
-            .addClass("item_name")
-            .appendTo(link);
-
-        var div = $('<div/>')
-            .addClass('pull-right')
-            .appendTo(item);
-
-        var buttons = $('<div/>')
-            .addClass("item_buttons pull-left")
-            .appendTo(div);
-
-        var div2 = $('<div/>')
-            .addClass('pull-right')
-            .appendTo(div);
-
-        $("<span/>")
-            .addClass("item_modified")
-            .addClass("pull-left")
-            .appendTo(div2);
-
-        $("<span/>")
-            .addClass("file_size")
-            .addClass("pull-right")
-            .appendTo(div2);
-
-        if (selectable === false) {
-            checkbox.css('visibility', 'hidden');
-        } else if (selectable === true) {
-            var that = this;
-            row.click(function(e) {
-                // toggle checkbox only if the click doesn't come from the checkbox or the link
-                if (!$(e.target).is('span[class=item_name]') && !$(e.target).is('input[type=checkbox]')) {
-                    checkbox.prop('checked', !checkbox.prop('checked'));
-                }
-                that._selection_changed();
-            });
-        }
-
-        $('<div/>')
-            .addClass('running-indicator')
-            .text(i18n.msg._('Running'))
-            .css('visibility', 'hidden')
-            .appendTo(buttons);
-
-        if (index === -1) {
-            this.element.append(row);
-        } else {
-            this.element.children().eq(index).after(row);
-        }
-        return row;
-    };
-
-
-    NotebookList.icons = {
-        directory: 'folder_icon',
-        notebook: 'notebook_icon',
-        file: 'file_icon'
-    };
-
-    NotebookList.uri_prefixes = {
-        directory: 'tree',
-        notebook: 'notebooks',
-        file: 'edit'
-    };
-
-    /**
-     * Select all items in the tree of specified type.
-     * selection_type : string among "select-all", "select-folders", "select-notebooks", "select-running-notebooks", "select-files"
-     *                  any other string (like "select-none") deselects all items
-     */
-    NotebookList.prototype.select = function(selection_type) {
-        var that = this;
-        $('.list_item').each(function(index, item) {
-            var item_type = $(item).data('type');
-            var state = false;
-            state = state || (selection_type === "select-all");
-            state = state || (selection_type === "select-folders" && item_type === 'directory');
-            state = state || (selection_type === "select-notebooks" && item_type === 'notebook');
-            state = state || (selection_type === "select-running-notebooks" && item_type === 'notebook' && that.sessions[$(item).data('path')] !== undefined);
-            state = state || (selection_type === "select-files" && item_type === 'file');
-            $(item).find('input[type=checkbox]').prop('checked', state);
-        });
-        this._selection_changed();
-    };
-
-    NotebookList.prototype._is_notebook = function(model) {
-      var ipynb_extensions = ['ipynb'];
-      return includes_extension(model.path, ipynb_extensions);
-    };
-
-    NotebookList.prototype._is_editable = function(model) {
-      // Allow any file to be "edited"
-      // Non-text files will display the following error:
-      //   Error: [FILE] is not UTF-8 encoded
-      //   Saving is disabled.
-      //   See Console for more details.
-      return true;
-    };
-
-    NotebookList.prototype._is_viewable = function(model) {
-      var html_types = ['htm', 'html', 'xhtml', 'xml', 'mht', 'mhtml'];
-      var media_extension = ['3gp', 'avi', 'mov', 'mp4', 'm4v', 'm4a', 'mp3', 'mkv', 'ogv', 'ogm', 'ogg', 'oga', 'webm', 'wav'];
-      var image_type = ['bmp', 'gif', 'jpg', 'jpeg', 'png', 'webp'];
-      var other_type = ['ico'];
-      var viewable_extensions = [].concat(html_types, media_extension, image_type, other_type);
-      return model.mimetype === 'text/html'
-        || includes_extension(model.path, viewable_extensions);
-    };
-
-    // Files like PDF that should be opened using `/files` prefix
-    NotebookList.prototype._is_pdflike = function(model) {
-      var pdflike_extensions = ['pdf'];
-      return includes_extension(model.path, pdflike_extensions);
-    };
-
-    /**
-     * Handles when any row selector checkbox is toggled.
-     */
-    NotebookList.prototype._selection_changed = function() {
-        // Use a JQuery selector to find each row with a checked checkbox.  If
-        // we decide to add more checkboxes in the future, this code will need
-        // to be changed to distinguish which checkbox is the row selector.
-        var that = this;
-        var selected = [];
-        var has_running_notebook = false;
-        var has_directory = false;
-        var has_file = false;
-        var checked = 0;
-        $('.list_item :checked').each(function(index, item) {
-            var parent = $(item).parent().parent();
-
-            // If the item doesn't have an upload button, isn't the
-            // breadcrumbs and isn't the parent folder '..', then it can be selected.
-            // Breadcrumbs path == ''.
-            if (parent.find('.upload_button').length === 0 && parent.data('path') !== '' && parent.data('path') !== utils.url_path_split(that.notebook_path)[0]) {
-                checked++;
-                selected.push({
-                    name: parent.data('name'),
-                    path: parent.data('path'),
-                    type: parent.data('type')
-                });
-
-                // Set flags according to what is selected.  Flags are later
-                // used to decide which action buttons are visible.
-                has_running_notebook = has_running_notebook ||
-                    (parent.data('type') === 'notebook' && that.sessions[parent.data('path')] !== undefined);
-                has_file = has_file || (parent.data('type') === 'file');
-                has_directory = has_directory || (parent.data('type') === 'directory');
-            }
-        });
-        this.selected = selected;
-
-        // Rename is only visible when one item is selected, and it is not a running notebook
-        if (selected.length === 1 && !has_running_notebook) {
-            $('.rename-button').css('display', 'inline-block');
-        } else {
-            $('.rename-button').css('display', 'none');
-        }
-
-        // Move is visible if at least one item is selected, and none of them
-        // are a running notebook.
-        if (selected.length > 0 && !has_running_notebook) {
-            $('.move-button').css('display', 'inline-block');
-        } else {
-            $('.move-button').css('display', 'none');
-        }
-
-        // Download is only visible when items are selected, and none are
-        // running notebooks or a directories
-        if (selected.length > 0 && !has_running_notebook && !has_directory) {
-            $('.download-button').css('display', 'inline-block');
-        } else {
-            $('.download-button').css('display', 'none');
-        }
-
-        // Shutdown is only visible when one or more notebooks running notebooks
-        // are selected and no non-notebook items are selected.
-        if (has_running_notebook && !(has_file || has_directory)) {
-            $('.shutdown-button').css('display', 'inline-block');
-        } else {
-            $('.shutdown-button').css('display', 'none');
-        }
-
-        // Duplicate isn't visible when a directory is selected.
-        if (selected.length > 0 && !has_directory) {
-            $('.duplicate-button').css('display', 'inline-block');
-        } else {
-            $('.duplicate-button').css('display', 'none');
-        }
-
-        // Delete is visible if one or more items are selected.
-        if (selected.length > 0) {
-            $('.delete-button').css('display', 'inline-block');
-        } else {
-            $('.delete-button').css('display', 'none');
-        }
-
-        // View is visible in the following case:
-        //
-        //   - the item is editable
-        //   - it is not a notebook
-        //
-        // If it's not editable or unknown, the default action should be view
-        // already so no need to show the button.
-        // That should include things like, html, py, txt, json....
-        if (selected.length >= 1 && !has_directory) {
-            $('.view-button').css('display', 'inline-block');
-        } else {
-            $('.view-button').css('display', 'none');
-        }
-
-        // Edit is visible when an item is unknown, that is to say:
-        //    - not in the editable list
-        //    - not in the known non-editable list.
-        //    - not a notebook.
-        // Indeed if it's editable the default action is already to edit.
-        // And non editable files should not show edit button.
-        // for unknown we'll assume users know what they are doing.
-        if (selected.length >= 1 && !has_directory && selected.every(function(el) {
-            return that._is_editable(el);
-        })) {
-            $('.edit-button').css('display', 'inline-block');
-        } else {
-            $('.edit-button').css('display', 'none');
-        }
-
-        // If all of the items are selected, show the selector as checked.  If
-        // some of the items are selected, show it as checked.  Otherwise,
-        // uncheck it.
-        var total = 0;
-        $('.list_item input[type=checkbox]').each(function(index, item) {
-            var parent = $(item).parent().parent();
-            // If the item doesn't have an upload button and it's not the
-            // breadcrumbs, it can be selected.  Breadcrumbs path == ''.
-            if (parent.find('.upload_button').length === 0 && parent.data('path') !== '' && parent.data('path') !== utils.url_path_split(that.notebook_path)[0]) {
-                total++;
-            }
-        });
-
-        var select_all = $("#select-all");
-        if (checked === 0) {
-            select_all.prop('checked', false);
-            select_all.prop('indeterminate', false);
-            select_all.data('indeterminate', false);
-        } else if (checked === total) {
-            select_all.prop('checked', true);
-            select_all.prop('indeterminate', false);
-            select_all.data('indeterminate', false);
-        } else {
-            select_all.prop('checked', false);
-            select_all.prop('indeterminate', true);
-            select_all.data('indeterminate', true);
-        }
-        // Update total counter
-        checked = bidi.applyBidi(checked);
-        $('#counter-select-all').html(checked===0 ? '&nbsp;' : checked);
-
-        //#issue 3961, update the checkbox aria-label when it changed
-        if(selected.length>=1){
-          if($('#select-all').prop("checked")){
-            // $('#button-select-all').attr("aria-label", i18n.msg._("Selected All "+ selected.length +" items"));
-            var msg1 = i18n.msg._("Selected All %d items")
-            $('#button-select-all').attr("aria-label", i18n.msg.sprintf(msg1, selected.length));
-          }
-          else{
-            // $('#button-select-all').attr("aria-label", i18n.msg._("Selected, "+ selected.length+" items"));
-            var msg2 = i18n.msg._("Selected, %d items")
-            $('#button-select-all').attr("aria-label", i18n.msg.sprintf(msg2, selected.length));
-          }
-        }
-        else{
-          $('#button-select-all').attr("aria-label", i18n.msg._("Select All/None"));
-        }
-
-        // If at aleast on item is selected, hide the selection instructions.
-        if (checked > 0) {
-            $('.dynamic-instructions').hide();
-        } else {
-            $('.dynamic-instructions').show();
-        }
-    };
-
-    NotebookList.prototype.add_link = function (model, item) {
-        var that = this;
-        var running = (model.type === 'notebook' && this.sessions[model.path] !== undefined);
-        item.data('name',model.name);
-        item.data('path', model.path);
-        item.data('modified', model.last_modified);
-        item.data('type', model.type);
-        item.find(".item_name").text(bidi.applyBidi(model.name));
-        var icon = NotebookList.icons[model.type];
-        if (running) {
-            icon = 'running_' + icon;
-        }
-        var uri_prefix = NotebookList.uri_prefixes[model.type];
-        if (model.type === 'file' && this._is_viewable(model))
-        {
-            uri_prefix = 'view';
-        }
-        if (model.type === 'file' && this._is_pdflike(model))
-        {
-            uri_prefix = 'files';
-        }
-        if (model.type === 'file' && this._is_notebook(model))
-        {
-            uri_prefix = 'notebooks';
-        }
-
-        item.find(".item_icon").addClass(icon).addClass('icon-fixed-width');
-        var link = item.find("a.item_link")
-            .attr('href',
-                utils.url_path_join(
-                    this.base_url,
-                    uri_prefix,
-                    utils.encode_uri_components(model.path)
-                )
-            );
-
-        item.find(".item_buttons .running-indicator").css('visibility', running ? '' : 'hidden');
-
-        // directory nav doesn't open new tabs
-        // files, notebooks do
-        if (model.type !== "directory") {
-            link.attr('target', IPython._target);
-        } else {
-            // Replace with a click handler that will use the History API to
-            // push a new route without reloading the page if the click is
-            // not modified (e.g., Ctrl-Click)
-            link.click(function (e) {
-                if(e.altKey || e.metaKey || e.shiftKey) {
-                    return true;
-                }
-                window.history.pushState({
-                    path: model.path
-                }, model.path, utils.url_path_join(
-                    that.base_url,
-                    'tree',
-                    utils.encode_uri_components(model.path)
-                ));
-                that.update_location(model.path);
-                return false;
-            });
-        }
-
-        // Add in the date that the file was last modified
-        item.find(".item_modified").text(utils.format_datetime(model.last_modified));
-        item.find(".item_modified").attr("title", moment(model.last_modified).format("YYYY-MM-DD HH:mm"));
-
-        var filesize = utils.format_filesize(model.size);
-        item.find(".file_size").text(filesize || '\xA0');
-    };
-
-
-    NotebookList.prototype.add_name_input = function (name, item, icon_type) {
-        item.data('name', name);
-        item.find(".item_icon").addClass(NotebookList.icons[icon_type]).addClass('icon-fixed-width');
-        item.find(".item_name").empty().append(
-            $('<input/>')
-            .addClass("filename_input")
-            .attr('value', name)
-            .attr('size', '30')
-            .attr('type', 'text')
-            .keyup(function(event){
-                if(event.keyCode === 13){item.find('.upload_button').click();}
-                else if(event.keyCode === 27){item.remove();}
-            })
-        );
-    };
-
-
-    NotebookList.prototype.add_file_data = function (data, item) {
-        item.data('filedata', data);
-    };
-
-
-    NotebookList.prototype.shutdown_selected = function() {
-        var that = this;
-        this.selected.forEach(function(item) {
-            if (item.type === 'notebook') {
-                that.shutdown_notebook(item.path);
-            }
-        });
-        // Deselect items after successful shutdown.
-        that.select('select-none');
-    };
-
-    NotebookList.prototype.shutdown_notebook = function(path) {
-        var that = this;
-        var settings = {
-            processData : false,
-            cache : false,
-            type : "DELETE",
-            dataType : "json",
-            success : function () {
-                that.load_sessions();
-            },
-            error : utils.log_ajax_error
-        };
-
-        var session = this.sessions[path];
-        if (session) {
-            var url = utils.url_path_join(
-                this.base_url,
-                'api/sessions',
-                encodeURIComponent(session.id)
-            );
-            utils.ajax(url, settings);
-        }
-    };
-
-    NotebookList.prototype.rename_selected = function() {
-        if (this.selected.length !== 1){
-            return;
-        }
-
-        var that = this;
-        var item_path = this.selected[0].path;
-        var item_name = this.selected[0].name;
-        var item_type = this.selected[0].type;
-        var input = $('<input/>')
-            .attr('type','text')
-            .attr('size','25')
-            .attr('aria-labelledby','rename-message')
-            .addClass('form-control')
-            .val(item_name);
-        var rename_msg = function (type) {
-        	switch(type) {
-        	case 'file': return i18n.msg._("Enter a new file name:");
-        	case 'directory': return i18n.msg._("Enter a new directory name:");
-        	case 'notebook': return i18n.msg._("Enter a new notebook name:");
-        	default: return i18n.msg._("Enter a new name:");
-        	}
-        };
-        var rename_title = function (type) {
-           	switch(type) {
-           	case 'file': return i18n.msg._("Rename file");
-           	case 'directory': return i18n.msg._("Rename directory");
-           	case 'notebook': return i18n.msg._("Rename notebook");
-           	default: return i18n.msg._("Rename");
-           	}
-        };
-        var dialog_body = $('<div/>').append(
-            $("<p/>").addClass("rename-message")
-                .attr('id', 'rename-message')
-                .text(rename_msg(item_type))
-        ).append(
-            $("<br/>")
-        ).append(input);
-
-        // This statement is used simply so that message extraction
-        // will pick up the strings.  The actual setting of the text
-        // for the button is in dialog.js.
-        var button_labels = [ i18n.msg._("Cancel"), i18n.msg._("Rename"), i18n.msg._("OK"), i18n.msg._("Move")];
-
-        var d = dialog.modal({
-            title : rename_title(item_type),
-            body : dialog_body,
-            default_button: "Cancel",
-            buttons : {
-                Cancel: {},
-                Rename : {
-                    class: "btn-primary",
-                    click: function() {
-                        that.contents.rename(item_path, utils.url_path_join(that.notebook_path, input.val())).then(function() {
-                            that.load_list();
-                            // Deselect items after successful rename.
-                            that.select('select-none');
-                        }).catch(function(e) {
-                        	var template = i18n.msg._("An error occurred while renaming \"%1$s\" to \"%2$s\".");
-                        	var failmsg = i18n.msg.sprintf(template,item_name,input.val());
-                            dialog.modal({
-                                title: i18n.msg._("Rename Failed"),
-                                body: $('<div/>')
-                                    .text(failmsg)
-                                    .append($('<div/>')
-                                        .addClass('alert alert-danger')
-                                        .text(e.message || e)),
-                                buttons: {
-                                    OK: {'class': 'btn-primary'}
-                                }
-                            });
-                            console.warn('Error during renaming :', e);
-                        });
-                    }
-                }
-            },
-            open : function () {
-                // Upon ENTER, click the OK button.
-                input.keydown(function (event) {
-                    if (event.which === keyboard.keycodes.enter) {
-                        d.find('.btn-primary').first().click();
-                        return false;
-                    }
-                });
-                input.focus();
-                // Highlight the filename (up to the filetype suffix) in the input field.
-                if (input.val().indexOf(".") > 0) {
-                    input[0].setSelectionRange(0,input.val().indexOf("."));
-                } else {
-                    input.select();
-                }
-            }
-        });
-    };
-
-    NotebookList.prototype.move_selected = function() {
-        var that = this;
-        var selected = that.selected.slice(); // Don't let that.selected change out from under us
-        var num_items = selected.length;
-
-        // Can move one or more selected items.
-        if (!(num_items >= 1)) {
-            return;
-        }
-
-        // Open a dialog to enter the new path, with current path as default.
-        var input = $('<input/>').attr('type','text').attr('size','25').attr('aria-labelledby','move-message').addClass('form-control')
-            .val(utils.url_path_join('/', that.notebook_path));
-        var dialog_body = $('<div/>').append(
-            $("<p/>").addClass("rename-message").attr('id', 'move-message')
-                .text(i18n.msg.sprintf(i18n.msg.ngettext("Enter a new destination directory path for this item:",
-                					"Enter a new destination directory path for these %d items:", num_items),num_items))
-        ).append(
-            $("<br/>")
-        ).append(
-            $("<div/>").append(
-                // $("<i/>").addClass("fa fa-folder").addClass("server-root")
-                $("<span/>").text(utils.get_body_data("serverRoot")).addClass("server-root")
-            ).append(
-              input.addClass("path-input")
-            ).addClass("move-path")
-        );
-        var d = dialog.modal({
-            title : i18n.msg.sprintf(i18n.msg.ngettext("Move an Item","Move %d Items",num_items),num_items),
-            body : dialog_body,
-            default_button: "Cancel",
-            buttons : {
-                Cancel : {},
-                Move : {
-                    class: "btn-primary",
-                    click: function() {
-                        // Move all the items.
-                        selected.forEach(function(item) {
-                            var item_path = item.path;
-                            var item_name = item.name;
-                            // Construct the new path using the user input and the item's name.
-                            var new_path = utils.url_path_join(input.val(), item_name);
-                            that.contents.rename(item_path, new_path).then(function() {
-                                // After each move finishes, reload the list.
-                                that.load_list();
-                            }).catch(function(e) {
-                                // If any of the moves fails, show this dialog for that move.
-                            	var failmsg = i18n.msg._("An error occurred while moving \"%1$s\" from \"%2$s\" to \"%3$s\".");
-                                dialog.modal({
-                                    title: i18n.msg._("Move Failed"),
-                                    body: $('<div/>')
-                                        .text(i18n.msg.sprintf(failmsg,item_name,item_path,new_path))
-                                        .append($('<div/>')
-                                            .addClass('alert alert-danger')
-                                            .text(e.message || e)),
-                                    buttons: {
-                                        OK: {'class': 'btn-primary'}
-                                    }
-                                });
-                                console.warn('Error during moving :', e);
-                            });
-                        });  // End of forEach.
-                    }
-                }
-            },
-            // TODO: Consider adding fancier UI per Issue #941.
-            open : function () {
-                // Upon ENTER, click the OK button.
-                input.keydown(function (event) {
-                    if (event.which === keyboard.keycodes.enter) {
-                        d.find('.btn-primary').first().click();
-                        return false;
-                    }
-                });
-                // Put the cursor at the end of the input.
-                input.focus();
-            }
-        });
-    };
-
-    NotebookList.prototype.download_selected = function() {
-        var that = this;
-
-        that.selected.forEach(function(item) {
-            var item_path = utils.encode_uri_components(item.path);
-            window.open(utils.url_path_join(that.base_url, 'files', item_path) + '?download=1', IPython._target);
-      	});
-    };
-
-    NotebookList.prototype.delete_selected = function() {
-        var selected = this.selected.slice(); // Don't let that.selected change out from under us
-        var template = i18n.msg.ngettext("Are you sure you want to permanently delete: \"%s\"?",
-        						"Are you sure you want to permanently delete the %d files or folders selected?",
-        						selected.length);
-        var delete_msg;
-        if (selected.length === 1) {
-            delete_msg = i18n.msg.sprintf(template, selected[0].name);
-        } else {
-            delete_msg = i18n.msg.sprintf(template, selected.length);
-        }
-        var that = this;
-        dialog.modal({
-            title : i18n.msg._("Delete"),
-            body : delete_msg,
-            default_button: "Cancel",
-            buttons : {
-                Cancel: {},
-                Delete : {
-                    class: "btn-danger",
-                    click: function() {
-                        // Shutdown any/all selected notebooks before deleting
-                        // the files.
-                        that.shutdown_selected();
-
-                        // Delete selected.
-                        selected.forEach(function(item) {
-                            that.contents.delete(item.path).then(function() {
-                                    that.notebook_deleted(item.path);
-                            }).catch(function(e) {
-                            	var failmsg = i18n.msg._("An error occurred while deleting \"%s\".");
-                                dialog.modal({
-                                    title: i18n.msg._("Delete Failed"),
-                                    body: $('<div/>')
-                                        .text(i18n.msg.sprintf(failmsg, item.path))
-                                        .append($('<div/>')
-                                            .addClass('alert alert-danger')
-                                            .text(e.message || e)),
-                                    buttons: {
-                                        OK: {'class': 'btn-primary'}
-                                    }
-                                });
-                                console.warn('Error during content deletion:', e);
-                            });
-                        });
-                    }
-                }
-            }
-        });
-    };
-
-    NotebookList.prototype.view_selected = function() {
-        var that = this;
-        that.selected.forEach(function(item) {
-            var item_path = utils.encode_uri_components(item.path);
-            var item_type = that._is_notebook(item) ? 'notebooks' : that._is_viewable(item) ? 'view' : 'files';
-            window.open(utils.url_path_join(that.base_url, item_type, item_path), IPython._target);
-      	});
-    };
-
-    NotebookList.prototype.edit_selected = function() {
-        var that = this;
-        that.selected.forEach(function(item) {
-            var item_path = utils.encode_uri_components(item.path);
-            window.open(utils.url_path_join(that.base_url, 'edit', item_path), IPython._target);
-      	});
-    };
-
-    NotebookList.prototype.duplicate_selected = function() {
-        var selected = this.selected.slice(); // Don't let that.selected change out from under us
-    	var template = i18n.msg.ngettext("Are you sure you want to duplicate: \"%s\"?",
-				"Are you sure you want to duplicate the %d files selected?",selected.length);
-    	var dup_msg;
-        if (selected.length === 1) {
-            dup_msg = i18n.msg.sprintf(template,selected[0].name);
-        } else {
-            dup_msg = i18n.msg.sprintf(template,selected.length);
-        }
-        var that = this;
-        dialog.modal({
-            title : i18n.msg._("Duplicate"),
-            body : dup_msg,
-            default_button: "Cancel",
-            buttons : {
-                Cancel: {},
-                Duplicate : {
-                    class: "btn-primary",
-                    click: function() {
-                        selected.forEach(function(item) {
-                            that.contents.copy(item.path, that.notebook_path).then(function () {
-                                that.load_list();
-                                // Deselect items after successful duplication.
-                                that.select('select-none');
-                            }).catch(function(e) {
-                            	var failmsg = i18n.msg._("An error occurred while duplicating \"%s\".");
-                                dialog.modal({
-                                    title: i18n.msg._("Duplicate Failed"),
-                                    body: $('<div/>')
-                                        .text(i18n.msg.sprintf(failmsg,item.path))
-                                        .append($('<div/>')
-                                            .addClass('alert alert-danger')
-                                            .text(e.message || e)),
-                                    buttons: {
-                                        OK: {'class': 'btn-primary'}
-                                    }
-                                });
-                                console.warn('Error during content duplication', e);
-                            });
-                        });
-                    }
-                }
-            }
-        });
-    };
-
-    NotebookList.prototype.notebook_deleted = function(path) {
-        /**
-         * Remove the deleted notebook.
-         */
-        var that = this;
-        $(".list_item").each(function() {
-            var element = $(this);
-            if (element.data("path") === path) {
-                element.remove();
-                events.trigger('notebook_deleted.NotebookList');
-                that._selection_changed();
-            }
-        });
-    };
-
-    // Add a new class for large file upload
-    NotebookList.prototype.add_large_file_upload_button = function (file) {
-        var that = this;
-        var item = that.new_item(0, true);
-        var stop_signal = false;
-        item.addClass('new-file');
-        that.add_name_input(file.name, item, 'file');
-        var cancel_button = $('<button/>').text("Cancel")
-            .addClass("btn btn-default btn-xs")
-            .click(function (e) {
-                item.remove();
-                stop_signal = true;
-                return false;
-            });
-
-        var upload_button = $('<button/>').text("Upload")
-            .addClass('btn btn-primary btn-xs upload_button')
-            .click(function (e) {
-                var filename = item.find('.item_name > input').val();
-                var path = utils.url_path_join(that.notebook_path, filename);
-                var format = 'text';
-                if (filename.length === 0 || filename[0] === '.') {
-                    dialog.modal({
-                        title : 'Invalid file name',
-                        body : "File names must be at least one character and not start with a dot",
-                        buttons : {'OK' : { 'class' : 'btn-primary' }}
-                    });
-                    return false;
-                }
-
-                var check_exist = function () {
-                    var exists = false;
-                    $.each(that.element.find('.list_item:not(.new-file)'), function(k,v){
-                    if ($(v).data('name') === filename) { exists = true; return false; }
-                    });
-                    return exists
-                };
-                var exists = check_exist();
-
-                var add_uploading_button = function (f, item) {
-                    // change buttons, add a progress bar
-                    var uploading_button = item.find('.upload_button').text("Uploading");
-                    uploading_button.off('click');  // Prevent double upload
-                    var progress_bar = $('<span/>')
-                        .addClass('progress-bar')
-                        .css('top', '0')
-                        .css('left', '0')
-                        .css('width', '0')
-                        .css('height', '3px')
-                        .css('border-radius', '0 0 0 0')
-                        .css('display', 'inline-block')
-                        .css('position', 'absolute');
-
-                    var parse_large_file = function (f, item) {
-                        // codes inspired by https://stackoverflow.com/a/28318964
-                        // 8MB chunk size chosen to match chunk sizes used by benchmark reference (AWS S3)
-                        var chunk_size = 1024 * 1024 * 8;
-                        var offset = 0;
-                        var chunk = 0;
-                        var chunk_reader = null;
-
-                        var large_reader_onload = function (event) {
-                            if (stop_signal === true) {
-                                return;
-                            }
-                            if (event.target.error == null) {
-                                offset += chunk_size;
-                                if (offset >= f.size) {
-                                    chunk = -1;
-                                } else {
-                                    chunk += 1;
-                                }
-                                // callback for handling reading: reader_onload in add_upload_button
-                                var item = $(event.target).data('item');
-                                that.add_file_data(event.target.result, item);
-                                upload_file(item, chunk);  // Do the upload
-                            } else {
-                                console.log("Read error: " + event.target.error);
-                            }
-                        };
-                        var on_error = function (event) {
-                            var item = $(event.target).data('item');
-                            var name = item.data('name');
-                            item.remove();
-                            var _exists = check_exist();
-                            if (_exists) {
-                                that.contents.delete(path);
-                            }
-                            dialog.modal({
-                                title : 'Failed to read file',
-                                body : "Failed to read file '" + name + "'",
-                                buttons : {'OK' : { 'class' : 'btn-primary' }}
-                            });
-                        };
-
-                        chunk_reader = function (_offset, _f) {
-                            var reader = new FileReader();
-                            var blob = _f.slice(_offset, chunk_size + _offset);
-                            // Load everything as ArrayBuffer
-                            reader.readAsArrayBuffer(blob);
-                            // Store the list item in the reader so we can use it later
-                            // to know which item it belongs to.
-                            $(reader).data('item', item);
-                            reader.onload = large_reader_onload;
-                            reader.onerror = on_error;
-                        };
-
-                        // This approach avoids triggering multiple GC pauses for large files.
-                        // Borrowed from kanaka's answer at:
-                        // https://stackoverflow.com/questions/12710001/how-to-convert-uint8-array-to-base64-encoded-string
-                        var  Uint8ToString = function(u8a){
-                            var CHUNK_SZ = 0x8000;
-                            var c = [];
-                            for (var i=0; i < u8a.length; i+=CHUNK_SZ) {
-                              c.push(String.fromCharCode.apply(null, u8a.subarray(i, i+CHUNK_SZ)));
-                            }
-                            return c.join("");
-                        };
-
-                        // These codes to upload file in original class
-                        var upload_file = function(item, chunk) {
-                            var filedata = item.data('filedata');
-                            if (filedata instanceof ArrayBuffer) {
-                                // base64-encode binary file data
-                                var buf = new Uint8Array(filedata);
-                                filedata = btoa(Uint8ToString(buf));
-                                format = 'base64';
-                            }
-                            var model = { name: filename, path: path };
-
-                            var name_and_ext = utils.splitext(filename);
-                            var file_ext = name_and_ext[1];
-                            var content_type;
-                            // Treat everything as generic file
-                            model.type = 'file';
-                            model.format = format;
-                            content_type = 'application/octet-stream';
-
-                            model.chunk = chunk;
-                            model.content = filedata;
-
-                            var on_success = function () {
-                                if (offset < f.size) {
-                                    // of to the next chunk
-                                    chunk_reader(offset, f);
-                                    // change progress bar and progress button
-                                    var progress = offset / f.size * 100;
-                                    progress = progress > 100 ? 100 : progress;
-                                    uploading_button.text(progress.toFixed(0)+'%');
-                                    progress_bar.css('width', progress+'%')
-                                        .attr('aria-valuenow', progress.toString());
-                                } else {
-                                    item.removeClass('new-file');
-                                    that.add_link(model, item);
-                                    that.session_list.load_sessions();
-                                }
-                            };
-                            that.contents.save(path, model).then(on_success, on_error);
-                        };
-
-                        // now let's start the read with the first block
-                        chunk_reader(offset, f);
-                    };
-                    item.find('.item_buttons')
-                        .append(progress_bar);
-                    parse_large_file(f, item);
-                };
-                if (exists) {
-                    dialog.modal({
-                        title : "Replace file",
-                        body : 'There is already a file named ' + filename + ', do you want to replace it?',
-                        default_button: "Cancel",
-                        buttons : {
-                            Overwrite : {
-                                class: "btn-danger",
-                                click: function () {
-                                    add_uploading_button(file, item);
-                                }
-                            },
-                            Cancel : {
-                                click: function() { item.remove(); }
-                            }
-                        }
-                    });
-                } else {
-                    add_uploading_button(file, item);
-                }
-
-                return false;
-            });
-        item.find(".item_buttons").empty()
-            .append(upload_button)
-            .append(cancel_button);
-    };
-
-    NotebookList.prototype.add_upload_button = function (item) {
-        var that = this;
-        var upload_button = $('<button/>').text(i18n.msg._("Upload"))
-            .addClass('btn btn-primary btn-xs upload_button')
-            .click(function (e) {
-                item.find('.upload_button').text("Uploading...");
-                var filename = item.find('.item_name > input').val();
-                var path = utils.url_path_join(that.notebook_path, filename);
-                var filedata = item.data('filedata');
-                var format = 'text';
-                if (filename.length === 0 || filename[0] === '.') {
-                    dialog.modal({
-                        title : i18n.msg._('Invalid file name'),
-                        body : i18n.msg._("File names must be at least one character and not start with a period"),
-                        buttons : {'OK' : { 'class' : 'btn-primary' }}
-                    });
-                    return false;
-                }
-                if (filedata instanceof ArrayBuffer) {
-                    // base64-encode binary file data
-                    var bytes = '';
-                    var buf = new Uint8Array(filedata);
-                    var nbytes = buf.byteLength;
-                    for (var i=0; i<nbytes; i++) {
-                        bytes += String.fromCharCode(buf[i]);
-                    }
-                    filedata = btoa(bytes);
-                    format = 'base64';
-                }
-                var model = { name: filename, path: path };
-
-                var name_and_ext = utils.splitext(filename);
-                var file_ext = name_and_ext[1];
-                var content_type;
-                if (file_ext === '.ipynb') {
-                    model.type = 'notebook';
-                    model.format = 'json';
-                    try {
-                        model.content = JSON.parse(filedata);
-                    } catch (e) {
-                    	var failbody = i18n.msg._("The error was: %s");
-                        dialog.modal({
-                            title : i18n.msg._('Cannot upload invalid Notebook'),
-                            body : i18n.msg.sprintf(failbody,e),
-                            buttons : {'OK' : {
-                                'class' : 'btn-primary',
-                                click: function () {
-                                    item.remove();
-                                }
-                            }}
-                        });
-                        console.warn('Error during notebook uploading', e);
-                        return false;
-                    }
-                    content_type = 'application/json';
-                } else {
-                    model.type = 'file';
-                    model.format = format;
-                    model.content = filedata;
-                    content_type = 'application/octet-stream';
-                }
-
-                var on_success = function () {
-                    item.removeClass('new-file');
-                    that.add_link(model, item);
-                    that.session_list.load_sessions();
-                };
-
-                var exists = false;
-                $.each(that.element.find('.list_item:not(.new-file)'), function(k,v){
-                    if ($(v).data('name') === filename) { exists = true; return false; }
-                });
-
-                if (exists) {
-                	var body = i18n.msg._("There is already a file named \"%s\". Do you want to replace it?");
-                    dialog.modal({
-                        title : i18n.msg._("Replace file"),
-                        body : i18n.msg.sprintf(body,filename),
-                        default_button: "Cancel",
-                        buttons : {
-                            Cancel : {
-                                click: function() { item.remove(); }
-                            },
-                            Overwrite : {
-                                class: "btn-danger",
-                                click: function () {
-                                    that.contents.save(path, model).then(on_success);
-                                }
-                            }
-                        }
-                    });
-                } else {
-                    that.contents.save(path, model).then(on_success);
-                }
-
-                return false;
-            });
-        var cancel_button = $('<button/>').text(i18n.msg._("Cancel"))
-            .addClass("btn btn-default btn-xs")
-            .click(function (e) {
-                item.remove();
-                return false;
-            });
-        item.find(".item_buttons").empty()
-            .append(upload_button)
-            .append(cancel_button);
-    };
-
-    return {'NotebookList': NotebookList};
-});
diff --git a/notebook/static/tree/js/sessionlist.js b/notebook/static/tree/js/sessionlist.js
deleted file mode 100644
index 031fa7ab0..000000000
--- a/notebook/static/tree/js/sessionlist.js
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/utils',
-    'bidi/bidi',
-], function($, utils, bidi) {
-    "use strict";
-
-    var isRTL = bidi.isMirroringEnabled();
-    var SesssionList = function (options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          events: $(Events) instance
-         *          base_url : string
-         */
-        this.events = options.events;
-        this.sessions = {};
-        this.base_url = options.base_url || utils.get_body_data("baseUrl");
-
-        // Add collapse arrows.
-        $('#running .panel-group .panel .panel-heading a').each(function(index, el) {
-            var $link = $(el);
-            var $icon = $('<i />')
-                .addClass('fa fa-caret-down');
-            $link.append($icon);
-            $link.down = true;
-            $link.click(function () {
-                if ($link.down) {
-                    $link.down = false;
-                    // jQeury doesn't know how to animate rotations.  Abuse
-                    // jQueries animate function by using an unused css attribute
-                    // to do the animation (borderSpacing).
-                    $icon.animate({ borderSpacing: 90 }, {
-                        step: function(now,fx) {
-                        	isRTL ? $icon.css('transform','rotate(' + now + 'deg)') : $icon.css('transform','rotate(-' + now + 'deg)');
-                        }
-                    }, 250);
-                } else {
-                    $link.down = true;
-                    // See comment above.
-                    $icon.animate({ borderSpacing: 0 }, {
-                        step: function(now,fx) {
-                        	isRTL ? $icon.css('transform','rotate(' + now + 'deg)') : $icon.css('transform','rotate(-' + now + 'deg)'); 
-                        }
-                    }, 250);
-                }
-            });
-        });
-    };
-    
-    SesssionList.prototype.load_sessions = function(){
-        var that = this;
-        var settings = {
-            processData : false,
-            cache : false,
-            type : "GET",
-            dataType : "json",
-            success : $.proxy(that.sessions_loaded, this),
-            error : utils.log_ajax_error,
-        };
-        var url = utils.url_path_join(this.base_url, 'api/sessions');
-        utils.ajax(url, settings);
-    };
-
-    SesssionList.prototype.sessions_loaded = function(data){
-        this.sessions = {};
-        var len = data.length;
-        var nb_path;
-        for (var i=0; i<len; i++) {
-            // The classic notebook only knows about sessions for notebooks,
-            // but the server now knows about more general sessions for
-            // things like consoles.
-            if (data[i].type === 'notebook') {
-                nb_path = data[i].notebook.path;
-                this.sessions[nb_path] = {
-                    id: data[i].id,
-                    kernel: {
-                    name: data[i].kernel.name
-                    }
-                };
-            }
-        }
-        this.events.trigger('sessions_loaded.Dashboard', this.sessions);
-    };
-
-    return {'SesssionList': SesssionList};
-});
diff --git a/notebook/static/tree/js/shutdownbutton.js b/notebook/static/tree/js/shutdownbutton.js
deleted file mode 100644
index e8b789fd1..000000000
--- a/notebook/static/tree/js/shutdownbutton.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/dialog',
-    'base/js/i18n',
-    'base/js/utils'
-], function(
-    $,
-    dialog,
-    i18n,
-    utils
-){
-    "use strict";
-
-    function display_shutdown_dialog() {
-        var body = $('<div/>').append(
-            $('<p/>').text(i18n.msg._("You have shut down Jupyter. You can now close this tab."))
-        ).append(
-            $('<p/>').text(i18n.msg._("To use Jupyter again, you will need to relaunch it."))
-        );
-
-        dialog.modal({
-            title: i18n.msg._("Server stopped"),
-            body: body
-        })
-    }
-
-    function activate() {
-        // Add shutdown button
-        $("button#shutdown").click(function () {
-            utils.ajax(utils.url_path_join(
-                utils.get_body_data("baseUrl"),
-                "api",
-                "shutdown"
-            ), {
-                type: "POST",
-                success: display_shutdown_dialog,
-                error: function (error) {
-                    console.log(error);
-                }
-            });
-        });
-    }
-
-    return {activate: activate}
-});
diff --git a/notebook/static/tree/js/terminallist.js b/notebook/static/tree/js/terminallist.js
deleted file mode 100644
index bf95f0c99..000000000
--- a/notebook/static/tree/js/terminallist.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-define([
-    'jquery',
-    'base/js/namespace',
-    'base/js/utils',
-    'base/js/i18n',
-    'tree/js/notebooklist',
-], function($, IPython, utils, i18n, notebooklist) {
-    "use strict";
-
-    var TerminalList = function (selector, options) {
-        /**
-         * Constructor
-         *
-         * Parameters:
-         *  selector: string
-         *  options: dictionary
-         *      Dictionary of keyword arguments.
-         *          base_url: string
-         */
-        this.base_url = options.base_url || utils.get_body_data("baseUrl");
-        this.element_name = options.element_name || 'running';
-        this.selector = selector;
-        this.terminals = [];
-        if (this.selector !== undefined) {
-            this.element = $(selector);
-            this.style();
-            this.bind_events();
-            this.load_terminals();
-        }
-    };
-
-    TerminalList.prototype = Object.create(notebooklist.NotebookList.prototype);
-
-    TerminalList.prototype.bind_events = function () {
-        var that = this;
-        $('#refresh_' + this.element_name + '_list').click(function () {
-            that.load_terminals();
-        });
-        $('#new-terminal').click($.proxy(this.new_terminal, this));
-    };
-
-    TerminalList.prototype.new_terminal = function (event) {
-        if (event) {
-            event.preventDefault();
-        }
-        var w = window.open('#', IPython._target);
-        var base_url = this.base_url;
-        var settings = {
-            type : "POST",
-            dataType: "json",
-            success : function (data, status, xhr) {
-                var name = data.name;
-                w.location = utils.url_path_join(base_url, 'terminals', 
-                    utils.encode_uri_components(name));
-            },
-            error : function(jqXHR, status, error){
-                w.close();
-                utils.log_ajax_error(jqXHR, status, error);
-            },
-        };
-        var url = utils.url_path_join(
-            this.base_url,
-            'api/terminals'
-        );
-        utils.ajax(url, settings);
-    };
-    
-    TerminalList.prototype.load_terminals = function() {
-        var url = utils.url_path_join(this.base_url, 'api/terminals');
-        utils.ajax(url, {
-            type: "GET",
-            cache: false,
-            dataType: "json",
-            success: $.proxy(this.terminals_loaded, this),
-            error : utils.log_ajax_error
-        });
-    };
-
-    TerminalList.prototype.terminals_loaded = function (data) {
-        this.terminals = data;
-        this.clear_list();
-        var item, term;
-        for (var i=0; i < this.terminals.length; i++) {
-            term = this.terminals[i];
-            item = this.new_item(-1);
-            this.add_link(term.name, item);
-            this.add_shutdown_button(term.name, item);
-        }
-        $('#terminal_list_header').toggle(data.length === 0);
-    };
-    
-    TerminalList.prototype.add_link = function(name, item) {
-        item.data('term-name', name);
-        item.find(".item_name").text("terminals/" + name);
-        item.find(".item_icon").addClass("fa fa-terminal");
-        var link = item.find("a.item_link")
-            .attr('href', utils.url_path_join(this.base_url, "terminals",
-                utils.encode_uri_components(name)));
-        link.attr('target', IPython._target||'_blank');
-        this.add_shutdown_button(name, item);
-    };
-    
-    TerminalList.prototype.add_shutdown_button = function(name, item) {
-        var that = this;
-        var shutdown_button = $("<button/>").text(i18n._("Shutdown")).addClass("btn btn-xs btn-warning").
-            click(function (e) {
-                var settings = {
-                    processData : false,
-                    type : "DELETE",
-                    dataType : "json",
-                    success : function () {
-                        that.load_terminals();
-                    },
-                    error : utils.log_ajax_error,
-                };
-                var url = utils.url_path_join(that.base_url, 'api/terminals',
-                    utils.encode_uri_components(name));
-                utils.ajax(url, settings);
-                return false;
-            });
-        item.find(".item_buttons").text("").append(shutdown_button);
-    };
-
-    return {TerminalList: TerminalList};
-});
diff --git a/notebook/static/tree/less/altuploadform.less b/notebook/static/tree/less/altuploadform.less
deleted file mode 100644
index 5555a634d..000000000
--- a/notebook/static/tree/less/altuploadform.less
+++ /dev/null
@@ -1,37 +0,0 @@
-/* We need an invisible input field on top of the sentense*/
-/* "Drag file onto the list ..." */
-
-.alternate_upload {
-    background-color:none;
-    display: inline;
-
-    &.form
-    {
-        padding: 0;
-        margin:0;
-    }
-
-    input.fileinput
-    {
-        position: absolute;
-
-        display: block;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-        cursor: pointer;
-        opacity: 0;
-        z-index: 2;
-    }
-
-    .btn-xs > input.fileinput {
-        margin: -@padding-xs-vertical -@padding-xs-horizontal;
-    }
-
-    .btn-upload {
-        position: relative;
-        height: @btn_mini_height;
-    }
-}
-
-::-webkit-file-upload-button { cursor:pointer; }
diff --git a/notebook/static/tree/less/style.less b/notebook/static/tree/less/style.less
deleted file mode 100644
index 04fac7c22..000000000
--- a/notebook/static/tree/less/style.less
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
-*
-* IPython tree view
-*
-*/
-@import "altuploadform.less";
-@import "tree.less";
\ No newline at end of file
diff --git a/notebook/static/tree/less/tree.less b/notebook/static/tree/less/tree.less
deleted file mode 100644
index 92200bfde..000000000
--- a/notebook/static/tree/less/tree.less
+++ /dev/null
@@ -1,449 +0,0 @@
-/**
- * Primary styles
- *
- * Author: Jupyter Development Team
- */
-
-@dashboard_tb_pad: 4px;
-@dashboard_lr_pad: 7px;
-// These are the total heights of the Bootstrap small and mini buttons. These values
-// are not less variables so we have to track them statically.
-@btn_small_height: 24px;
-@btn_mini_height: 22px;
-@dark_dashboard_color: @breadcrumb-color;
-
-// The left padding of the selector button's contents.
-@dashboard-selectorbtn-lpad: 7px;
-
-ul#tabs {
-    margin-bottom: @dashboard_tb_pad;
-}
-
-ul#tabs a {
-    padding-top: @dashboard_tb_pad + 2px;
-    padding-bottom: @dashboard_tb_pad;
-}
-
-[dir="rtl"] ul#tabs.nav-tabs > li {
-    float : right;
-}
-
-[dir="rtl"] ul#tabs.nav.nav-tabs {
-    padding-right: 0;
-}
-
-ul.breadcrumb {
-    a:focus, a:hover {
-        text-decoration: none;
-    }
-    i.icon-home {
-        font-size: 16px;
-        margin-right: 4px;
-    }
-
-    span {
-        color: @dark_dashboard_color;
-    }
-}
-
-.list_toolbar {
-    padding: @dashboard_tb_pad 0 @dashboard_tb_pad 0;
-    vertical-align: middle;
-
-    .tree-buttons {
-        padding-top: 1px;
-    }
-}
-
-[dir="rtl"] .list_toolbar {
-    .tree-buttons .pull-right {
-        .pull-left();
-    }
-    .col-sm-4 , .col-sm-8 {
-        float : right;
-    }
-}
-
-.dynamic-buttons {
-    padding-top: @dashboard_tb_pad - 1px;
-    display: inline-block;
-    width: 400px;
-
-}
-
-.list_toolbar [class*="span"] {
-    min-height: @btn_small_height;
-}
-
-.list_header {
-    font-weight: bold;
-    background-color: @page-backdrop-color
-}
-
-.list_placeholder {
-    font-weight: bold;
-    padding-top: @dashboard_tb_pad;
-    padding-bottom: @dashboard_tb_pad;
-    padding-left: @dashboard_lr_pad;
-    padding-right: @dashboard_lr_pad;
-}
-
-.list_container {
-  margin-top: @dashboard_tb_pad;
-  margin-bottom: 5*@dashboard_tb_pad;
-  border: 1px solid @table-border-color;
-  border-radius: @border-radius-base;
-}
-
-.list_container > div {
-  border-bottom: 1px solid @table-border-color;
-  &:hover .list-item{
-    background-color: red;
-  };
-}
-
-.list_container > div:last-child {
-  border: none;
-}
-
-.list_item {
-  &:hover .list_item {
-    background-color: @table-border-color;
-  };
-  a {text-decoration: none;}
-  &:hover {
-    background-color: darken(white,2%);
-  }
-}
-
-.list_header>div, .list_item>div {
-    padding-top: @dashboard_tb_pad;
-    padding-bottom: @dashboard_tb_pad;
-    padding-left: @dashboard_lr_pad;
-    padding-right: @dashboard_lr_pad;
-    line-height: @btn_mini_height;
-
-    input {
-        margin-right: @dashboard_lr_pad;
-        margin-left: @dashboard_lr_pad + @dashboard-selectorbtn-lpad;
-        vertical-align: text-bottom;
-        line-height: @btn_mini_height;
-        position: relative;
-        top: -1px;
-    }
-
-    .item_link {
-        margin-left: -1px;
-        vertical-align: baseline;
-        line-height: @btn_mini_height;
-    }
-}
-
-[dir="rtl"] .list_item>div {
-
-    input {
-        margin-right : 0;
-    }
-}
-
-.new-file input[type=checkbox] {
-    visibility: hidden;
-}
-
-.item_name {
-    line-height: @btn_mini_height;
-    height: @btn_small_height;
-}
-
-.item_icon {
-    font-size: 14px;
-    color: @dark_dashboard_color;
-    margin-right: @dashboard_lr_pad;
-    margin-left: @dashboard_lr_pad;
-    line-height: @btn_mini_height;
-    vertical-align: baseline;
-}
-
-.item_modified {
-    margin-right: @dashboard_lr_pad;
-    margin-left: @dashboard_lr_pad;
-}
-
-.file_size {
-    width: 65px;
-    text-align: right;
-}
-
-[dir="rtl"] .item_modified.pull-right{
-    .pull-left();
-}
-
-.item_buttons {
-    line-height: 1em;
-    .btn-toolbar();
-    .btn {
-        min-width: 13ex;
-    }
-    .running-indicator {
-        padding-top: @dashboard_tb_pad;
-        // accessibility improvement
-        color: darken(@brand-success,25%);
-    }
-    .kernel-name {
-        padding-top: @dashboard_tb_pad;
-        color: @brand-info;
-        margin-right: @dashboard_lr_pad;
-        float: left;
-    }
-}
-
-[dir="rtl"] .item_buttons.pull-right {
-    .pull-left();
-}
-
-[dir="rtl"] .item_buttons {
-    .kernel-name {
-        margin-left : @dashboard_lr_pad;
-        float : right;
-        // accessibility improvement
-        color: #489eb8;
-        font-weight: 700;
-    }
-}
-
-.toolbar_info {
-    height: @btn_small_height;
-    line-height: @btn_small_height;
-}
-
-.list_item input:not([type=checkbox]) {
-    // These settings give these inputs a height that matches @btn_mini_height = 22
-    padding-top: 3px;
-    padding-bottom: 3px;
-    height: @btn_mini_height;
-    line-height: 14px;
-    margin: 0px;
-}
-
-.highlight_text {
-    color: blue;
-}
-
-#project_name {
-    display: inline-block;
-    padding-left: @dashboard_lr_pad;
-    margin-left: -2px;
-    // accessibility improvement
-    color: darken(@link-color, 10%);
-
-    > .breadcrumb {
-        padding: 0px;
-        margin-bottom: 0px;
-        background-color: transparent;
-        font-weight: bold;
-
-    }
-}
-
-.sort_button {
-    display: inline-block;
-    padding-left: @dashboard_lr_pad;
-}
-
-[dir="rtl"] .sort_button.pull-right {
-    .pull-left();
-}
-
-#tree-selector {
-    padding-right: 0px;
-}
-
-#button-select-all {
-    min-width: 50px;
-}
-
-[dir="rtl"] #button-select-all.btn {
-    float : right ;
-}
-
-#select-all {
-    margin-left: @dashboard_lr_pad;
-    margin-right: 2px;
-    margin-top: 2px;
-
-    height: 16px;
-}
-
-[dir="rtl"] #select-all.pull-left {
-    .pull-right();
-}
-
-.menu_icon {
-    margin-right: 2px;
-}
-
-.tab-content .row {
-    margin-left: 0px;
-    margin-right: 0px;
-}
-
-.folder_icon:before {
-    .icon(@fa-var-folder-o);
-}
-
-.notebook_icon:before {
-    .icon(@fa-var-book);
-    position: relative;
-    top: -1px;
-}
-
-.running_notebook_icon:before {
-    .icon(@fa-var-book);
-    position: relative;
-    top: -1px;
-
-    color: @brand-success;
-}
-
-
-.file_icon:before {
-    .icon(@fa-var-file-o);
-    position: relative;
-    top: -2px;
-}
-
-#notebook_toolbar .pull-right {
-    padding-top: 0px;
-    margin-right: -1px;
-}
-
-ul#new-menu {
-    // align right instead of left
-    left: auto;
-    right: 0;
-}
-
-#new-menu .dropdown-header {
-    font-size: 10px;
-    border-bottom: 1px solid #e5e5e5;
-    padding: 0 0 3px;
-    margin: -3px 20px 0;
-}
-
-.kernel-menu-icon {
-    padding-right: 12px;
-    width: 24px;
-    content: @fa-var-square-o;
-}
-
-.kernel-menu-icon:before {
-    content: @fa-var-square-o;
-}
-
-.kernel-menu-icon-current:before {
-    content: @fa-var-check;
-}
-
-#tab_content {
-    padding-top: @page-header-padding;
-}
-
-#running {
-    .panel-group{
-        .panel {
-            margin-top: 3px;
-            margin-bottom: 1em;
-
-            .panel-heading {
-                background-color: @page-backdrop-color;
-                padding-top: @dashboard_tb_pad;
-                padding-bottom: @dashboard_tb_pad;
-                padding-left: @dashboard_lr_pad;
-                padding-right: @dashboard_lr_pad;
-                line-height: @btn_mini_height;
-
-                a:focus, a:hover {
-                    text-decoration: none;
-                }
-            }
-
-            .panel-body {
-                padding: 0px;
-
-                .list_container {
-                    margin-top: 0px;
-                    margin-bottom: 0px;
-                    border: 0px;
-                    border-radius: 0px;
-
-                    .list_item {
-                        border-bottom: 1px solid @table-border-color;
-
-                        &:last-child {
-                            border-bottom: 0px;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-.delete-button {
-    display: none;
-}
-
-.duplicate-button {
-    display: none;
-}
-
-.rename-button {
-    display: none;
-}
-
-.move-button {
-    display: none;
-}
-
-.download-button {
-    display: none;
-}
-
-.shutdown-button {
-    display: none;
-}
-
-.dynamic-instructions {
-    display: inline-block;
-    padding-top: @dashboard_tb_pad;
-}
-
-//TO show tooltips via keyboard for"Duplicate","View","Rename", "Download", "Shutdown", "Edit","Move", "Delete" buttons.
-.dynamic-buttons {
-    button:focus + [role="tooltip"] {
-        visibility: visible;
-        opacity: 1;
-    }
-
-    [role="tooltip"] {
-        /* Position the tooltip */
-        position: absolute;
-        top:70%;
-        display:inline;
-        //--------------
-        visibility: hidden;
-        background-color: #F0EFEF;
-        color: #080808;
-        text-align: center;
-        padding: 3px;
-        outline-color: grey;
-        outline-offset: -2px;
-        outline-style: auto;
-        outline-width:1px;
-        z-index: 1;
-        opacity: 0;
-        transition: opacity .6s;
-        margin: 3px;
-        font-size:10px;
-    }
-}
diff --git a/notebook/tests/selenium/test_save_readonly_as.py b/notebook/tests/selenium/test_save_readonly_as.py
index 6cab7b863..31ad7a9f9 100644
--- a/notebook/tests/selenium/test_save_readonly_as.py
+++ b/notebook/tests/selenium/test_save_readonly_as.py
@@ -38,44 +38,46 @@ def refresh_notebook(nb):
     nb.browser.refresh()
     nb.__init__(nb.browser)
 
-def test_save_readonly_notebook_as(notebook):
-    # Make notebook read-only
-    notebook.edit_cell(index=0, content='import os\nimport stat\nos.chmod("'
-        + notebook.browser.current_url.split('?')[0].split('/')[-1] + '", stat.S_IREAD)\nprint(0)')
-    notebook.browser.execute_script("Jupyter.notebook.get_cell(0).execute();")
-    notebook.wait_for_cell_output(0)
-    refresh_notebook(notebook)
-    # Test that the notebook is read-only
-    assert notebook.browser.execute_script('return Jupyter.notebook.writable') == False
 
-    # Add some content
-    test_content_0 = "print('a simple')\nprint('test script')"
-    notebook.edit_cell(index=0, content=test_content_0)
-
-    # Wait for Save As modal, save
-    save_as(notebook)
-    wait_for_selector(notebook.browser, '.save-message')
-    inp = notebook.browser.find_element(By.XPATH, '//input[@data-testid="save-as"]')
-    inp.send_keys('writable_notebook.ipynb')
-    inp.send_keys(Keys.RETURN)
-    wait_for_rename(notebook.browser, "writable_notebook")
-    # Test that the name changed
-    assert get_notebook_name(notebook) == "writable_notebook.ipynb"
-    # Test that address bar was updated (TODO: get the base url)
-    assert "writable_notebook.ipynb" in notebook.browser.current_url
-    # Test that it is no longer read-only
-    assert notebook.browser.execute_script('return Jupyter.notebook.writable') == True
-
-    # Add some more content
-    test_content_1 = "print('a second simple')\nprint('script to test save feature')"
-    notebook.add_and_execute_cell(content=test_content_1)
-    # and save the notebook
-    execute_promise("Jupyter.notebook.save_notebook()", notebook.browser)
-    
-    # Test that it still contains the content
-    assert notebook.get_cell_contents(index=0) == test_content_0
-    assert notebook.get_cell_contents(index=1) == test_content_1
-    # even after a refresh 
-    refresh_notebook(notebook)
-    assert notebook.get_cell_contents(index=0) == test_content_0
-    assert notebook.get_cell_contents(index=1) == test_content_1
+# TODO(PR6474): Revisit and re-enable this test
+# def test_save_readonly_notebook_as(notebook):
+#     # Make notebook read-only
+#     notebook.edit_cell(index=0, content='import os\nimport stat\nos.chmod("'
+#         + notebook.browser.current_url.split('?')[0].split('/')[-1] + '", stat.S_IREAD)\nprint(0)')
+#     notebook.browser.execute_script("Jupyter.notebook.get_cell(0).execute();")
+#     notebook.wait_for_cell_output(0)
+#     refresh_notebook(notebook)
+#     # Test that the notebook is read-only
+#     assert notebook.browser.execute_script('return Jupyter.notebook.writable') == False
+#
+#     # Add some content
+#     test_content_0 = "print('a simple')\nprint('test script')"
+#     notebook.edit_cell(index=0, content=test_content_0)
+#
+#     # Wait for Save As modal, save
+#     save_as(notebook)
+#     wait_for_selector(notebook.browser, '.save-message')
+#     inp = notebook.browser.find_element_by_xpath('//input[@data-testid="save-as"]')
+#     inp.send_keys('writable_notebook.ipynb')
+#     inp.send_keys(Keys.RETURN)
+#     wait_for_rename(notebook.browser, "writable_notebook")
+#     # Test that the name changed
+#     assert get_notebook_name(notebook) == "writable_notebook.ipynb"
+#     # Test that address bar was updated (TODO: get the base url)
+#     assert "writable_notebook.ipynb" in notebook.browser.current_url
+#     # Test that it is no longer read-only
+#     assert notebook.browser.execute_script('return Jupyter.notebook.writable') == True
+#
+#     # Add some more content
+#     test_content_1 = "print('a second simple')\nprint('script to test save feature')"
+#     notebook.add_and_execute_cell(content=test_content_1)
+#     # and save the notebook
+#     execute_promise("Jupyter.notebook.save_notebook()", notebook.browser)
+#
+#     # Test that it still contains the content
+#     assert notebook.get_cell_contents(index=0) == test_content_0
+#     assert notebook.get_cell_contents(index=1) == test_content_1
+#     # even after a refresh
+#     refresh_notebook(notebook)
+#     assert notebook.get_cell_contents(index=0) == test_content_0
+#     assert notebook.get_cell_contents(index=1) == test_content_1
diff --git a/pyproject.toml b/pyproject.toml
index d623560e8..11ac701fd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires=["jupyter_packaging~=0.9"]
+requires=["jupyter_packaging~=0.9", "nbclassic>=0.4.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.check-manifest]
@@ -10,7 +10,6 @@ ignore-bad-ideas = ["notebook/i18n/**/*.mo"]
 skip = ["check-links"]
 
 [tool.jupyter-releaser.hooks]
-after-bump-version = "python setup.py jsversion"
 before-build-python = ["pip install babel", "npm install -g po2json"]
 
 [tool.jupyter-releaser.options]
diff --git a/setup.py b/setup.py
index a0296e605..e8e23c104 100755
--- a/setup.py
+++ b/setup.py
@@ -58,12 +58,7 @@ from setupbase import (
     find_packages,
     find_package_data,
     check_package_data_first,
-    CompileCSS,
-    CompileJS,
     CompileBackendTranslation,
-    Bower,
-    JavascriptVersion,
-    css_js_prerelease,
 )
 
 
@@ -126,11 +121,12 @@ for more information.
         'ipykernel', # bless IPython kernel for now
         'Send2Trash>=1.8.0',
         'terminado>=0.8.3',
-        'prometheus_client'
+        'prometheus_client',
+        'nbclassic>=0.4.0',
     ],
     extras_require = {
         'test': ['pytest', 'coverage', 'requests', 'testpath',
-                 'nbval', 'selenium==4.3', 'pytest', 'pytest-cov'],
+                 'nbval', 'selenium==4.1.5', 'pytest', 'pytest-cov'],
         'docs': ['sphinx', 'nbsphinx', 'sphinxcontrib_github_alt',
                  'sphinx_rtd_theme', 'myst-parser'],
         'test:sys_platform != "win32"': ['requests-unixsocket'],
@@ -163,15 +159,10 @@ class bdist_egg_disabled(bdist_egg):
         sys.exit("Aborting implicit building of eggs. Use `pip install .` to install from source.")
 
 setup_args['cmdclass'] = {
-    'build_py': css_js_prerelease(
-            check_package_data_first(build_py)),
-    'sdist' : css_js_prerelease(sdist, strict=True),
-    'develop': css_js_prerelease(develop),
-    'css' : CompileCSS,
+    'build_py': check_package_data_first(build_py),
+    'sdist' : sdist,
+    'develop': develop,
     'backendtranslations': CompileBackendTranslation,
-    'js' : CompileJS,
-    'jsdeps' : Bower,
-    'jsversion' : JavascriptVersion,
     'bdist_egg': bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled,
 }
 
@@ -179,8 +170,8 @@ try:
     from wheel.bdist_wheel import bdist_wheel
 except ImportError:
     pass
-else:
-    setup_args['cmdclass']['bdist_wheel'] = css_js_prerelease(bdist_wheel)
+# else:
+#     setup_args['cmdclass']['bdist_wheel'] = css_js_prerelease(bdist_wheel)
 
 # Run setup --------------------
 def main():
diff --git a/setupbase.py b/setupbase.py
index ebccd2ac7..ce5b5693e 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -29,6 +29,7 @@ else:
     def list2cmdline(cmd_list):
         return ' '.join(map(pipes.quote, cmd_list))
 
+
 #-------------------------------------------------------------------------------
 # Useful globals and utility functions
 #-------------------------------------------------------------------------------
@@ -72,6 +73,7 @@ loose_pep440re = re.compile(r'^([1-9]\d*!)?(0|[1-9]\d*)(\.(0|[1-9]\d*))*((a|b|rc
 if not loose_pep440re.match(version):
     raise ValueError('Invalid version number `%s`, please follow pep440 convention or pip will get confused about which package is more recent.' % version)
 
+
 #---------------------------------------------------------------------------
 # Find packages
 #---------------------------------------------------------------------------
@@ -89,6 +91,7 @@ def find_packages():
         packages.append(package)
     return packages
 
+
 #---------------------------------------------------------------------------
 # Find package data
 #---------------------------------------------------------------------------
@@ -100,113 +103,14 @@ def find_package_data():
     # This is not enough for these things to appear in a sdist.
     # We need to muck with the MANIFEST to get this to work
 
-    # exclude components and less from the walk;
-    # we will build the components separately
-    excludes = [
-        pjoin('static', 'components'),
-        pjoin('static', '*', 'less'),
-        pjoin('static', '*', 'node_modules')
-    ]
-
     # walk notebook resources:
     cwd = os.getcwd()
     os.chdir('notebook')
-    static_data = []
-    for parent, dirs, files in os.walk('static'):
-        if any(fnmatch(parent, pat) for pat in excludes):
-            # prevent descending into subdirs
-            dirs[:] = []
-            continue
-        for f in files:
-            static_data.append(pjoin(parent, f))
-
-    # for verification purposes, explicitly add main.min.js
-    # so that installation will fail if they are missing
-    for app in ['auth', 'edit', 'notebook', 'terminal', 'tree']:
-        static_data.append(pjoin('static', app, 'js', 'main.min.js'))
-
-    components = pjoin("static", "components")
-    # select the components we actually need to install
-    # (there are lots of resources we bundle for sdist-reasons that we don't actually use)
-    static_data.extend([
-        pjoin(components, "backbone", "backbone-min.js"),
-        pjoin(components, "bootstrap", "dist", "js", "bootstrap.min.js"),
-        pjoin(components, "bootstrap-tour", "build", "css", "bootstrap-tour.min.css"),
-        pjoin(components, "bootstrap-tour", "build", "js", "bootstrap-tour.min.js"),
-        pjoin(components, "create-react-class", "index.js"),
-        pjoin(components, "font-awesome", "css", "*.css"),
-        pjoin(components, "google-caja", "html-css-sanitizer-minified.js"),
-        pjoin(components, "es6-promise", "*.js"),
-        pjoin(components, "font-awesome", "fonts", "*.*"),
-        pjoin(components, "jed", "jed.js"),
-        pjoin(components, "jquery", "jquery.min.js"),
-        pjoin(components, "jquery-typeahead", "dist", "jquery.typeahead.min.js"),
-        pjoin(components, "jquery-typeahead", "dist", "jquery.typeahead.min.css"),
-        pjoin(components, "jquery-ui", "jquery-ui.min.js"),
-        pjoin(components, "jquery-ui", "themes", "smoothness", "jquery-ui.min.css"),
-        pjoin(components, "jquery-ui", "themes", "smoothness", "images", "*"),
-        pjoin(components, "marked", "lib", "marked.js"),
-        pjoin(components, "react", "react.production.min.js"),
-        pjoin(components, "react", "react-dom.production.min.js"),
-        pjoin(components, "requirejs", "require.js"),
-        pjoin(components, "requirejs-plugins", "src", "json.js"),
-        pjoin(components, "requirejs-text", "text.js"),
-        pjoin(components, "sanitizer", "index.js"),
-        pjoin(components, "underscore", "underscore-min.js"),
-        pjoin(components, "moment", "moment.js"),
-        pjoin(components, "moment", "min", "*.js"),
-        pjoin(components, "xterm.js", "index.js"),
-        pjoin(components, "xterm.js-css", "index.css"),
-        pjoin(components, "xterm.js-fit", "index.js"),
-        pjoin(components, "text-encoding", "lib", "encoding.js"),
-    ])
-
-    # Ship all of Codemirror's CSS and JS
-    for parent, dirs, files in os.walk(pjoin(components, 'codemirror')):
-        for f in files:
-            if f.endswith(('.js', '.css')):
-                static_data.append(pjoin(parent, f))
-
-    # Trim mathjax
-    mj = lambda *path: pjoin(components, 'MathJax', *path)
-    static_data.extend([
-        mj('MathJax.js'),
-        mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'),
-        mj('config', 'Safe.js'),
-    ])
-
-    trees = []
-    mj_out = mj('jax', 'output')
-
-    if os.path.exists(mj_out):
-        for output in os.listdir(mj_out):
-            path = pjoin(mj_out, output)
-            static_data.append(pjoin(path, '*.js'))
-            autoload = pjoin(path, 'autoload')
-            if os.path.isdir(autoload):
-                trees.append(autoload)
-
-    for tree in trees + [
-        mj('localization'), # limit to en?
-        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
-        mj('extensions'),
-        mj('jax', 'input', 'TeX'),
-        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
-        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
-        mj('jax', 'element', 'mml'),
-    ]:
-        for parent, dirs, files in os.walk(tree):
-            for f in files:
-                static_data.append(pjoin(parent, f))
-
-    os.chdir(os.path.join('tests',))
-    js_tests = glob('*.js') + glob('*/*.js')
 
     os.chdir(cwd)
 
     package_data = {
-        'notebook' : ['templates/*'] + static_data,
-        'notebook.tests' : js_tests,
+        'notebook' : ['templates/*'],
         'notebook.bundler.tests': ['resources/*', 'resources/*/*', 'resources/*/*/.*'],
         'notebook.services.api': ['api.yaml'],
         'notebook.i18n': ['*/LC_MESSAGES/*.*'],
@@ -239,6 +143,7 @@ def check_package_data_first(command):
             command.run(self)
     return DecoratedCommand
 
+
 def update_package_data(distribution):
     """update package_data to catch changes during setup"""
     build_py = distribution.get_command_obj('build_py')
@@ -246,6 +151,7 @@ def update_package_data(distribution):
     # re-init build_py options which load package_data
     build_py.finalize_options()
 
+
 #---------------------------------------------------------------------------
 # Notebook related
 #---------------------------------------------------------------------------
@@ -319,10 +225,6 @@ except ImportError:
 
 static = pjoin(repo_root, 'notebook', 'static')
 
-npm_path = os.pathsep.join([
-    pjoin(repo_root, 'node_modules', '.bin'),
-    os.environ.get("PATH", os.defpath),
-])
 
 def mtime(path):
     """shorthand for mtime"""
@@ -335,6 +237,7 @@ def run(cmd, *args, **kwargs):
     kwargs['shell'] = (sys.platform == 'win32')
     return check_call(cmd, *args, **kwargs)
 
+
 class CompileBackendTranslation(Command):
     description = "compile the .po files into .mo files, that contain the translations."
 
@@ -360,75 +263,6 @@ class CompileBackendTranslation(Command):
                      '-o', pjoin('notebook', 'i18n', LANG, 'LC_MESSAGES', component+'.mo')
                     ])
 
-class Bower(Command):
-    description = "fetch static client-side components with bower"
-
-    user_options = [
-        ('force', 'f', "force fetching of bower dependencies"),
-    ]
-
-    def initialize_options(self):
-        self.force = False
-
-    def finalize_options(self):
-        self.force = bool(self.force)
-
-    bower_dir = pjoin(static, 'components')
-    node_modules = pjoin(repo_root, 'node_modules')
-    sanitizer_dir = pjoin(bower_dir, 'sanitizer')
-
-    def should_run(self):
-        if self.force:
-            return True
-        if not os.path.exists(self.bower_dir):
-            return True
-        if not os.path.exists(self.sanitizer_dir):
-            return True
-
-        bower_stale = mtime(self.bower_dir) < mtime(pjoin(repo_root, 'bower.json'))
-        if bower_stale:
-            return True
-
-        return mtime(self.sanitizer_dir) < mtime(pjoin(repo_root, 'webpack.config.js'))
-
-    def should_run_npm(self):
-        if not which('npm'):
-            print("npm unavailable", file=sys.stderr)
-            return False
-        if not os.path.exists(self.node_modules):
-            return True
-        return mtime(self.node_modules) < mtime(pjoin(repo_root, 'package.json'))
-
-    def run(self):
-        if not self.should_run():
-            print("bower dependencies up to date")
-            return
-
-        if self.should_run_npm():
-            print("installing build dependencies with npm")
-            run(['npm', 'install'], cwd=repo_root)
-            os.utime(self.node_modules, None)
-
-        env = os.environ.copy()
-        env['PATH'] = npm_path
-
-        try:
-            run(
-                ['bower', 'install', '--allow-root', '--config.interactive=false'],
-                cwd=repo_root,
-                env=env
-            )
-        except OSError as e:
-            print("Failed to run bower: %s" % e, file=sys.stderr)
-            print("You can install js dependencies with `npm install`", file=sys.stderr)
-            raise
-        # self.npm_components()
-        if not os.path.exists(self.sanitizer_dir):
-            run(['npm', 'run', 'build:webpack'], cwd=repo_root, env=env)
-        os.utime(self.bower_dir, None)
-        # update package data in case this created new files
-        update_package_data(self.distribution)
-
 
 def patch_out_bootstrap_bw_print():
     """Hack! Manually patch out the bootstrap rule that forces printing in B&W.
@@ -452,204 +286,3 @@ def patch_out_bootstrap_bw_print():
     with open(print_less, 'w') as f:
         f.writelines(lines)
 
-class CompileCSS(Command):
-    """Recompile Notebook CSS
-
-    Regenerate the compiled CSS from LESS sources.
-
-    Requires various dev dependencies, such as require and lessc.
-    """
-    description = "Recompile Notebook CSS"
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    sources = []
-    targets = []
-    for name in ('ipython', 'style'):
-        sources.append(pjoin(static, 'style', '%s.less' % name))
-        targets.append(pjoin(static, 'style', '%s.min.css' % name))
-
-    def run(self):
-        self.run_command('jsdeps')
-        env = os.environ.copy()
-        env['PATH'] = npm_path
-
-        patch_out_bootstrap_bw_print()
-
-        for src, dst in zip(self.sources, self.targets):
-            try:
-                run(['lessc',
-                    '--source-map',
-                    '--include-path=%s' % pipes.quote(static),
-                    src,
-                    dst,
-                ], cwd=repo_root, env=env)
-            except OSError as e:
-                print("Failed to build css: %s" % e, file=sys.stderr)
-                print("You can install js dependencies with `npm install`", file=sys.stderr)
-                raise
-        # update package data in case this created new files
-        update_package_data(self.distribution)
-
-
-class CompileJS(Command):
-    """Rebuild Notebook Javascript main.min.js files and translation files.
-
-    Calls require via build-main.js
-    """
-    description = "Rebuild Notebook Javascript main.min.js files"
-    user_options = [
-        ('force', 'f', "force rebuilding js targets"),
-    ]
-
-    def initialize_options(self):
-        self.force = False
-
-    def finalize_options(self):
-        self.force = bool(self.force)
-
-    apps = ['notebook', 'tree', 'edit', 'terminal', 'auth']
-    targets = [ pjoin(static, app, 'js', 'main.min.js') for app in apps ]
-
-    def sources(self, name):
-        """Generator yielding .js sources that an application depends on"""
-        yield pjoin(repo_root, 'tools', 'build-main.js')
-        yield pjoin(static, name, 'js', 'main.js')
-
-        for sec in [name, 'base', 'auth']:
-            for f in glob(pjoin(static, sec, 'js', '*.js')):
-                if not f.endswith('.min.js'):
-                    yield f
-        yield pjoin(static, 'services', 'config.js')
-        if name == 'notebook':
-            for f in glob(pjoin(static, 'services', '*', '*.js')):
-                yield f
-        for parent, dirs, files in os.walk(pjoin(static, 'components')):
-            if os.path.basename(parent) == 'MathJax':
-                # don't look in MathJax, since it takes forever to walk it
-                dirs[:] = []
-                continue
-            for f in files:
-                yield pjoin(parent, f)
-
-    def should_run(self, name, target):
-        if self.force or not os.path.exists(target):
-            return True
-        target_mtime = mtime(target)
-        for source in self.sources(name):
-            if mtime(source) > target_mtime:
-                print(source, target)
-                return True
-        return False
-
-    def build_main(self, name):
-        """Build main.min.js"""
-        target = pjoin(static, name, 'js', 'main.min.js')
-
-        if not self.should_run(name, target):
-            log.info("%s up to date" % target)
-            return
-        log.info("Rebuilding %s" % target)
-        run(['node', 'tools/build-main.js', name])
-
-    def build_jstranslation(self, trd):
-        lang = trd[-5:]
-        run([
-            pjoin('node_modules', '.bin', 'po2json'),
-            '-p', '-F',
-            '-f', 'jed1.x',
-            '-d', 'nbjs',
-            pjoin('notebook', 'i18n', lang, 'LC_MESSAGES', 'nbjs.po'),
-            pjoin('notebook', 'i18n', lang, 'LC_MESSAGES', 'nbjs.json'),
-        ])
-
-    def run(self):
-        self.run_command('jsdeps')
-        env = os.environ.copy()
-        env['PATH'] = npm_path
-        pool = ThreadPool()
-        pool.map(self.build_main, self.apps)
-        pool.map(self.build_jstranslation, glob('notebook/i18n/??_??'))
-        # update package data in case this created new files
-        update_package_data(self.distribution)
-
-
-class JavascriptVersion(Command):
-    """write the javascript version to notebook javascript"""
-    description = "Write Jupyter version to javascript"
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        nsfile = pjoin(repo_root, "notebook", "static", "base", "js", "namespace.js")
-        with open(nsfile) as f:
-            lines = f.readlines()
-        with open(nsfile, 'w') as f:
-            found = False
-            for line in lines:
-                if line.strip().startswith("Jupyter.version"):
-                    line = f'    Jupyter.version = "{version}";\n'
-                    found = True
-                f.write(line)
-            if not found:
-                raise RuntimeError("Didn't find Jupyter.version line in %s" % nsfile)
-
-
-def css_js_prerelease(command, strict=False):
-    """decorator for building minified js/css prior to another command"""
-    class DecoratedCommand(command):
-        def run(self):
-            self.distribution.run_command('jsversion')
-            jsdeps = self.distribution.get_command_obj('jsdeps')
-            js = self.distribution.get_command_obj('js')
-            css = self.distribution.get_command_obj('css')
-            jsdeps.force = js.force = strict
-
-            targets = [ jsdeps.bower_dir ]
-            targets.extend(js.targets)
-            targets.extend(css.targets)
-            missing = [ t for t in targets if not os.path.exists(t) ]
-
-            if not is_repo and not missing:
-                # If we're an sdist, we aren't a repo and everything should be present.
-                # Don't rebuild js/css in that case.
-                command.run(self)
-                return
-
-            try:
-                self.distribution.run_command('js')
-                self.distribution.run_command('css')
-                self.distribution.run_command('backendtranslations')
-            except Exception as e:
-                # refresh missing
-                missing = [ t for t in targets if not os.path.exists(t) ]
-                if strict or missing:
-                    # die if strict or any targets didn't build
-                    prefix = os.path.commonprefix([repo_root + os.sep] + missing)
-                    missing = [ m[len(prefix):] for m in missing ]
-                    log.warn("rebuilding js and css failed. The following required files are missing: %s" % missing)
-                    raise e
-                else:
-                    log.warn("rebuilding js and css failed (not a problem)")
-                    log.warn(str(e))
-
-            # check again for missing targets, just in case:
-            missing = [ t for t in targets if not os.path.exists(t) ]
-            if missing:
-                # command succeeded, but targets still missing (?!)
-                prefix = os.path.commonprefix([repo_root + os.sep] + missing)
-                missing = [ m[len(prefix):] for m in missing ]
-                raise ValueError("The following required files are missing: %s" % missing)
-
-            command.run(self)
-    return DecoratedCommand
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index bdb252ffd..000000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const path = require('path');
-const crypto = require('crypto');
-
-// Workaround for loaders using "md4" by default, which is not supported in FIPS-compliant OpenSSL
-// See https://github.com/jupyterlab/jupyterlab/issues/11248
-const cryptoOrigCreateHash = crypto.createHash;
-crypto.createHash = (algorithm) =>
-  cryptoOrigCreateHash(algorithm == 'md4' ? 'sha256' : algorithm);
-
-module.exports = {
-  entry: ['babel-polyfill', '@jupyterlab/apputils/lib/sanitizer'],
-  output: {
-    filename: 'index.js',
-    path: path.resolve(__dirname, 'notebook/static/components/sanitizer'),
-    libraryTarget: "amd",
-  },
-  devtool: false,
-  optimization: {
-    minimize: false
-  },
-  module: {
-    rules: [
-      {
-        test: /\.m?jsx?$/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            presets: ['@babel/preset-env'],
-          }
-        }
-      }
-    ]
-  }
-}