diff --git a/lib/app.js b/lib/app.js
index 636705cd..484d5c85 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -32,12 +32,10 @@ function run () {
   return runner()
 }
 
-const pp = require('./pp')
 function runOnce () {
   return verifySchema.valid()
   .then(() => settingsLoader.loadLatest())
   .then(settings => {
-    // pp(settings)
     poller.start(settings)
 
     const httpsServerOptions = {
diff --git a/lib/routes.js b/lib/routes.js
index 07e29089..c9f0ba29 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -377,6 +377,7 @@ app.get('/await_dispense/:txId', waitForDispense)
 app.post('/dispense', dispense)
 
 app.use(errorHandler)
+app.use((req, res) => res.status(404).json({err: 'No such route'}))
 
 localApp.get('/pid', (req, res) => {
   const deviceId = req.query.device_id
diff --git a/lib/settings-loader.js b/lib/settings-loader.js
index b1c2a242..3701b2ee 100644
--- a/lib/settings-loader.js
+++ b/lib/settings-loader.js
@@ -13,7 +13,6 @@ function loadFixture () {
   const fixture = argv.fixture
   const machine = argv.machine
 
-  console.log('DEBUG22: %j', [fixture, machine])
   if (fixture && !machine) throw new Error('Missing --machine parameter for --fixture')
 
   const fixturePath = fixture => path.resolve(__dirname, '..', 'test', 'fixtures', fixture + '.json')
@@ -82,7 +81,6 @@ function loadLatestConfig () {
   return Promise.all([db.oneOrNone(sql, ['config']), loadFixture()])
   .then(([row, fixture]) => {
     const config = row ? row.data.config : []
-    require('./pp')(fixture)
     return mergeValues(config, fixture)
   })
 }