diff --git a/lib/app.js b/lib/app.js
index 9917d4a6..99a81ad7 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -35,11 +35,6 @@ module.exports = function (options) {
     plugins.startPolling()
     plugins.startCheckingNotification()
 
-    console.log('DEBUG9.3 ****************')
-
-
-    console.log('DEBUG9 ****************')
-
     var authMiddleware
 
     if (options.https) {
@@ -76,26 +71,6 @@ module.exports = function (options) {
 
     if (options.mock) logger.info('In mock mode')
 
-    var localApp = express()
-    localApp.use(bodyParser.json())
-    var localServer = http.createServer(localApp)
-    var localPort = 7070
-
-    console.log('DEBUG7 ****************')
-    routes.init({
-      app: app,
-      localApp: localApp,
-      plugins: plugins,
-      authMiddleware: authMiddleware,
-      // reloadConfigMiddleware: reloadConfigMiddleware,
-      mock: options.mock
-    })
-
-    // localServer.listen(7070, 'localhost', function () {
-    //   console.log('lamassu-server is listening on local port %d', localPort)
-    // })
-
     return server
   })
-  .catch(e => console.log(e.stack))
 }
diff --git a/lib/config-manager.js b/lib/config-manager.js
index 160867c3..812d865a 100644
--- a/lib/config-manager.js
+++ b/lib/config-manager.js
@@ -1,17 +1,9 @@
-var pgp = require('pg-promise')()
-var psqlUrl = require('../lib/options').postgresql
 var R = require('ramda')
-
-function connect () {
-  console.log(psqlUrl)
-  return pgp(psqlUrl)
-}
+var db = require('./db')
 
 function load () {
-  var db = connect()
   return db.one('select data from user_config where type=$1', 'config')
   .then(function (data) {
-    pgp.end()
     return data.data
   })
 }
@@ -19,10 +11,9 @@ function load () {
 function loadAccounts () {
   const toFields = fieldArr => R.fromPairs(R.map(r => [r.code, r.value], fieldArr))
   const toPairs = r => [r.code, toFields(r.fields)]
-  var db = connect()
+
   return db.one('select data from user_config where type=$1', 'accounts')
   .then(function (data) {
-    pgp.end()
     return R.fromPairs(R.map(toPairs, data.data.accounts))
   })
 }
diff --git a/lib/logger.js b/lib/logger.js
index b9f9fb34..bb2940d4 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -15,5 +15,4 @@ const logger = new winston.Logger({
 var version = require('../package.json').version
 logger.info('Version: %s', version)
 
-
 module.exports = logger
diff --git a/todo.txt b/todo.txt
index e76b8375..ffdf626f 100644
--- a/todo.txt
+++ b/todo.txt
@@ -120,3 +120,7 @@ v finish idempotency for all calls
 - test pending action (action needs to take a while so we can test)
 - defaults and validation
 - tweak install script
+
+---------------
+
+- clean up lamassu-server script, app, routes