diff --git a/doc/listings/interstore/cal.py b/doc/listings/interstore/cal.py
index 663e47d..842eab3 100644
--- a/doc/listings/interstore/cal.py
+++ b/doc/listings/interstore/cal.py
@@ -32,7 +32,7 @@ class Busy(Exception):
 class MakeAppointment(Command):
     arguments = [("whom", SenderArgument()), ("when", String())]
     response = [("appointmentID", Unicode())]
-    errors = {"busy": Busy}
+    errors = {Busy: "busy"}
 
 
 class Appointment(Item, AMPReceiver):
diff --git a/xmantissa/test/test_theme.py b/xmantissa/test/test_theme.py
index 6abc7e7..c71e359 100644
--- a/xmantissa/test/test_theme.py
+++ b/xmantissa/test/test_theme.py
@@ -241,7 +241,7 @@ def test_publicPage(self):
 
     def test_navPage(self):
         """
-        Test that L{webapp.GenericNavigationLivePage} supports theming of
+        Test that L{webapp.GenericNavigationAthenaPage} supports theming of
         Athena's unsupported-browser page based on an L{ITemplateNameResolver}
         installed on the viewing user's store.
         """
diff --git a/xmantissa/webapp.py b/xmantissa/webapp.py
index 018088e..ef2a45f 100644
--- a/xmantissa/webapp.py
+++ b/xmantissa/webapp.py
@@ -21,7 +21,7 @@
 from axiom.userbase import getAccountNames
 
 from nevow.rend import Page
-from nevow import livepage, athena
+from nevow import athena
 from nevow.inevow import IRequest
 from nevow import tags as t
 from nevow import url
@@ -331,29 +331,6 @@ def __init__(self, webapp, fragment, pageComponents, username):
         _FragmentWrapperMixin.__init__(self, fragment, pageComponents)
 
 
-class GenericNavigationLivePage(_FragmentWrapperMixin, livepage.LivePage, _ShellRenderingMixin):
-    def __init__(self, webapp, fragment, pageComponents, username):
-        livepage.LivePage.__init__(self, docFactory=webapp.getDocFactory('shell'))
-        _ShellRenderingMixin.__init__(self, webapp, pageComponents, username)
-        _FragmentWrapperMixin.__init__(self, fragment, pageComponents)
-
-    # XXX TODO: support live nav, live fragments somehow
-    def render_head(self, ctx, data):
-        ctx.tag[t.invisible(render=t.directive("liveglue"))]
-        return _FragmentWrapperMixin.render_head(self, ctx, data)
-
-    def goingLive(self, ctx, client):
-        getattr(self.fragment, 'goingLive', lambda x, y: None)(ctx, client)
-
-    def locateHandler(self, ctx, path, name):
-        handler = getattr(self.fragment, 'locateHandler', None)
-
-        if handler is None:
-            return getattr(self.fragment, 'handle_' + name)
-        else:
-            return handler(ctx, path, name)
-
-
 
 class GenericNavigationAthenaPage(_FragmentWrapperMixin,
                                   MantissaLivePage,