diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
index b0a78e5db..a0ba65b05 100644
--- a/IPython/frontend/html/notebook/notebookapp.py
+++ b/IPython/frontend/html/notebook/notebookapp.py
@@ -106,7 +106,6 @@ aliases.update(dict(
     ip = 'IPythonNotebookApp.ip',
     port = 'IPythonNotebookApp.port',
     colors = 'ZMQInteractiveShell.colors',
-    editor = 'RichIPythonWidget.editor',
 ))
 
 #-----------------------------------------------------------------------------
@@ -126,7 +125,7 @@ class IPythonNotebookApp(BaseIPythonApplication):
     
     classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session,
                RoutingKernelManager, NotebookManager,
-               KernelManager, SessionManager, RichIPythonWidget]
+               KernelManager, SessionManager]
     flags = Dict(flags)
     aliases = Dict(aliases)
 
diff --git a/IPython/frontend/html/notebook/notebookmanager.py b/IPython/frontend/html/notebook/notebookmanager.py
index e8f8d10e0..0d8bb2673 100644
--- a/IPython/frontend/html/notebook/notebookmanager.py
+++ b/IPython/frontend/html/notebook/notebookmanager.py
@@ -27,7 +27,9 @@ from IPython.utils.traitlets import Unicode, List, Dict
 
 class NotebookManager(LoggingConfigurable):
 
-    notebook_dir = Unicode(os.getcwd())
+    notebook_dir = Unicode(os.getcwd(), config=True, help="""
+        The directory to use for notebooks.
+    """)
     filename_ext = Unicode(u'.ipynb')
     allowed_formats = List([u'json',u'xml',u'py'])