--- a/annot-server/server.tac	Fri Oct 10 17:08:31 2014 +0200
+++ b/annot-server/server.tac	Mon Oct 13 12:43:47 2014 +0200
@@ -14,7 +14,7 @@
 from txpostgres import txpostgres
 
 from annotserver import make_service
-from config import config
+import config
 from models import get_table_create_stmt
 from utils import create_connection_pool
 
@@ -22,7 +22,7 @@
 psycopg2.extras.register_uuid()
 
 
-conn, d = create_connection_pool(config['conn_str'])
+conn, d = create_connection_pool(config.CONN_STR)
 #to do treat error
 d.addCallback(lambda _: conn.runOperation(get_table_create_stmt()))
 
@@ -32,5 +32,5 @@
 
 application = service.Application("annot-server")
 
-annotserver = make_service(config, conn)
+annotserver = make_service(conn)
 annotserver.setServiceParent(service.IServiceCollection(application))