diff --git a/ankisyncd/__init__.py b/ankisyncd/__init__.py
index 5958cdb..629db46 100644
--- a/ankisyncd/__init__.py
+++ b/ankisyncd/__init__.py
@@ -1,15 +1,2 @@
-
 import sys
 sys.path.insert(0, "/usr/share/anki")
-
-#def server_runner(app, global_conf, **kw):
-#    """ Special version of paste.httpserver.server_runner which calls 
-#    AnkiServer.thread.shutdown() on server exit."""
-#
-#    from paste.httpserver import server_runner as paste_server_runner
-#    from AnkiServer.thread import shutdown
-#    try:
-#        paste_server_runner(app, global_conf, **kw)
-#    finally:
-#        shutdown()
-#
diff --git a/ankisyncd/collection.py b/ankisyncd/collection.py
index d73c2a1..f0ed914 100644
--- a/ankisyncd/collection.py
+++ b/ankisyncd/collection.py
@@ -1,11 +1,8 @@
-
 import anki
 import anki.storage
 
 import os, errno
 
-__all__ = ['CollectionWrapper', 'CollectionManager']
-
 class CollectionWrapper(object):
     """A simple wrapper around an anki.storage.Collection object.
 
diff --git a/ankisyncd/sync_app.py b/ankisyncd/sync_app.py
index 6b7a9b2..956dfe2 100644
--- a/ankisyncd/sync_app.py
+++ b/ankisyncd/sync_app.py
@@ -730,12 +730,7 @@ class SqliteUserManager(SimpleUserManager):
 
         return (db_ret != None and hashobj.hexdigest()+salt == db_hash)
 
-# Our entry point
 def make_app(global_conf, **local_conf):
-    if local_conf.has_key('session_db_path'):
-        local_conf['session_manager'] = SqliteSessionManager(local_conf['session_db_path'])
-    if local_conf.has_key('auth_db_path'):
-        local_conf['user_manager'] = SqliteUserManager(local_conf['auth_db_path'])
     return SyncApp(**local_conf)
 
 def main():
@@ -752,7 +747,7 @@ def main():
         print "Starting..."
         httpd.serve_forever()
     except KeyboardInterrupt:
-        print "Exiting ..."
+        print "Exiting..."
     finally:
         shutdown()
 
diff --git a/ankisyncd/thread.py b/ankisyncd/thread.py
index eb319bd..cf891fb 100644
--- a/ankisyncd/thread.py
+++ b/ankisyncd/thread.py
@@ -1,4 +1,3 @@
-
 from __future__ import absolute_import
 
 from ankisyncd.collection import CollectionWrapper, CollectionManager
@@ -8,8 +7,6 @@ from Queue import Queue
 
 import time, logging
 
-__all__ = ['ThreadingCollectionWrapper', 'ThreadingCollectionManager']
-
 class ThreadingCollectionWrapper(object):
     """Provides the same interface as CollectionWrapper, but it creates a new Thread to 
     interact with the collection."""