diff --git a/bin/convert-txs.js b/bin/convert-txs.js
index c2dfe3c9..2e724f98 100755
--- a/bin/convert-txs.js
+++ b/bin/convert-txs.js
@@ -5,11 +5,11 @@ var psqlUrl = require('../lib/options').postgresql
 
 var db = pgp(psqlUrl)
 
-db.$manyOrNone(`select * from transactions where incoming=false
+db.manyOrNone(`select * from transactions where incoming=false
   and stage='final_request' and authority='machine'`)
   .then(rs =>
     db.tx(t =>
-      t.batch(rs.map(r => db.$none(`insert into cash_in_txs (session_id,
+      t.batch(rs.map(r => db.none(`insert into cash_in_txs (session_id,
       device_fingerprint, to_address, crypto_atoms, crypto_code, fiat,
       currency_code, fee, tx_hash, error, created) values ($1, $2, $3, $4, $5,
       $6, $7, $8, $9, $10, $11)`, [r.session_id, r.device_fingerprint,
@@ -18,11 +18,11 @@ db.$manyOrNone(`select * from transactions where incoming=false
       )
     )
   )
-  .then(() => db.$manyOrNone(`select * from transactions where incoming=true
+  .then(() => db.manyOrNone(`select * from transactions where incoming=true
   and stage='initial_request' and authority='pending'`))
   .then(rs =>
     db.tx(t =>
-      t.batch(rs.map(r => db.$none(`insert into cash_out_txs (session_id,
+      t.batch(rs.map(r => db.none(`insert into cash_out_txs (session_id,
       device_fingerprint, to_address, crypto_atoms, crypto_code, fiat,
       currency_code, tx_hash, phone, error, created) values ($1, $2, $3, $4, $5,
       $6, $7, $8, $9, $10, $11)`, [r.session_id, r.device_fingerprint,
@@ -31,13 +31,13 @@ db.$manyOrNone(`select * from transactions where incoming=false
       )
     )
   )
-  .then(() => db.$manyOrNone(`select * from transactions where incoming=true
+  .then(() => db.manyOrNone(`select * from transactions where incoming=true
   and stage='dispense' and authority='authorized'`))
   .then(rs =>
     db.tx(t =>
       t.batch(rs.map(r =>
-        db.$none(`update cash_out_txs set dispensed=true where session_id=$1`, [r.session_id])
-          .then(() => db.$none(`insert into cash_out_actions (session_id, action,
+        db.none(`update cash_out_txs set dispensed=true where session_id=$1`, [r.session_id])
+          .then(() => db.none(`insert into cash_out_actions (session_id, action,
       created) values ($1, $2, $3)`, [r.session_id, 'dispensed', r.created]))
       ))
     )
diff --git a/bin/lamassu-migrate b/bin/lamassu-migrate
index 3b71f0e4..3138efc8 100755
--- a/bin/lamassu-migrate
+++ b/bin/lamassu-migrate
@@ -23,12 +23,12 @@ const getMigrateFile = () => {
 
 const store = defaultStore()
 asyncLocalStorage.run(store, () => {
-  db.$none(createMigration)
-    .then(() => Promise.all([db.$oneOrNone(select), getMigrateFile()]))
+  db.none(createMigration)
+    .then(() => Promise.all([db.oneOrNone(select), getMigrateFile()]))
     .then(([qResult, migrateFile]) => {
       process.env.SKIP_SERVER_LOGS = !(qResult && qResult.data.migrations.find(({ title }) => title === '1572524820075-server-support-logs.js'))
       if (!qResult && migrateFile) {
-        return db.$none('insert into migrations (id, data) values (1, $1)', [migrateFile])
+        return db.none('insert into migrations (id, data) values (1, $1)', [migrateFile])
       }
     })
     .then(() => migrate.run())
diff --git a/bin/migrate-config.js b/bin/migrate-config.js
index deff1d2d..32e89ae2 100644
--- a/bin/migrate-config.js
+++ b/bin/migrate-config.js
@@ -7,7 +7,7 @@ const psqlUrl = require('../lib/options').postgresql
 
 const db = pgp(psqlUrl)
 
-db.$many('select data from user_config', 'exchanges')
+db.many('select data from user_config', 'exchanges')
   .then(rows => {
     const config = rows.filter(r => r.type === 'exchanges')[0].data
     const brain = rows.filter(r => r.type === 'unit')[0].data
@@ -33,7 +33,7 @@ db.$many('select data from user_config', 'exchanges')
       accounts: settings.plugins.settings
     }
 
-    db.$none('insert into user_config (type, data) values ($1, $2)', ['global', newConfig])
+    db.none('insert into user_config (type, data) values ($1, $2)', ['global', newConfig])
       .then(() => {
         console.log('Success.')
         process.exit(0)
diff --git a/lib/admin/accounts.js b/lib/admin/accounts.js
index 60741710..8ae3084a 100644
--- a/lib/admin/accounts.js
+++ b/lib/admin/accounts.js
@@ -18,7 +18,7 @@ function loadSchemas () {
 const schemas = loadSchemas()
 
 function fetchAccounts () {
-  return db.$oneOrNone('select data from user_config where type=$1 and schema_version=$2', ['accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.oneOrNone('select data from user_config where type=$1 and schema_version=$2', ['accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => {
     // Hard code this for now
       const accounts = [{
@@ -31,7 +31,7 @@ function fetchAccounts () {
 
       return row
         ? Promise.resolve(row.data.accounts)
-        : db.$none('insert into user_config (type, data, valid) values ($1, $2, $3)', ['accounts', {accounts}, true])
+        : db.none('insert into user_config (type, data, valid) values ($1, $2, $3)', ['accounts', {accounts}, true])
           .then(fetchAccounts)
     })
 }
@@ -102,7 +102,7 @@ function getAccount (accountCode) {
 }
 
 function save (accounts) {
-  return db.$none('update user_config set data=$1 where type=$2 and schema_version=$3', [{accounts: accounts}, 'accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.none('update user_config set data=$1 where type=$2 and schema_version=$3', [{accounts: accounts}, 'accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
 }
 
 function updateAccounts (newAccount, accounts) {
diff --git a/lib/admin/config-validate.js b/lib/admin/config-validate.js
index e8bac122..1bc04b3f 100644
--- a/lib/admin/config-validate.js
+++ b/lib/admin/config-validate.js
@@ -104,7 +104,7 @@ function getGroupField (group, fieldCode) {
 // Note: We can't use machine-loader because it relies on settings-loader,
 // which relies on this
 function getMachines () {
-  return db.$any('select device_id from devices')
+  return db.any('select device_id from devices')
 }
 
 function fetchMachines () {
diff --git a/lib/admin/config.js b/lib/admin/config.js
index 92c5e2cc..328cadcf 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -22,7 +22,7 @@ function fetchConfig () {
   const sql = `select data from user_config where type=$1 and schema_version=$2
   order by id desc limit 1`
 
-  return db.$oneOrNone(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.oneOrNone(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row ? row.data.config : [])
 }
 
diff --git a/lib/admin/login.js b/lib/admin/login.js
index fb43c3e8..c7cf852b 100644
--- a/lib/admin/login.js
+++ b/lib/admin/login.js
@@ -7,7 +7,7 @@ function generateOTP (name) {
 
   const sql = 'insert into one_time_passes (token, name) values ($1, $2)'
 
-  return db.$none(sql, [otp, name])
+  return db.none(sql, [otp, name])
     .then(() => otp)
 }
 
@@ -16,7 +16,7 @@ function validateOTP (otp) {
     where token=$1
     returning name, created < now() - interval '1 hour' as expired`
 
-  return db.$one(sql, [otp])
+  return db.one(sql, [otp])
     .then(r => ({success: !r.expired, expired: r.expired, name: r.name}))
     .catch(() => ({success: false, expired: false}))
 }
@@ -29,7 +29,7 @@ function register (otp) {
       const token = crypto.randomBytes(32).toString('hex')
       const sql = 'insert into user_tokens (token, name) values ($1, $2)'
 
-      return db.$none(sql, [token, r.name])
+      return db.none(sql, [token, r.name])
         .then(() => ({success: true, token: token}))
     })
     .catch(() => ({success: false, expired: false}))
@@ -38,7 +38,7 @@ function register (otp) {
 function authenticate (token) {
   const sql = 'select token from user_tokens where token=$1'
 
-  return db.$one(sql, [token]).then(() => true).catch(() => false)
+  return db.one(sql, [token]).then(() => true).catch(() => false)
 }
 
 module.exports = {
diff --git a/lib/admin/pairing.js b/lib/admin/pairing.js
index ab22c68d..0bdade02 100644
--- a/lib/admin/pairing.js
+++ b/lib/admin/pairing.js
@@ -25,7 +25,7 @@ function totem (hostname, name) {
       const buf = Buffer.concat([caHash, token, Buffer.from(hostname)])
       const sql = 'insert into pairing_tokens (token, name) values ($1, $3), ($2, $3)'
 
-      return db.$none(sql, [hexToken, caHexToken, name])
+      return db.none(sql, [hexToken, caHexToken, name])
         .then(() => bsAlpha.encode(buf))
     })
 }
diff --git a/lib/admin/server.js b/lib/admin/server.js
index e4cb9c0f..0aa93706 100644
--- a/lib/admin/server.js
+++ b/lib/admin/server.js
@@ -20,7 +20,7 @@ function machinesLastPing () {
   from machine_events
   group by device_id`
 
-  return Promise.all([machineLoader.getMachineNames(), db.$any(sql)])
+  return Promise.all([machineLoader.getMachineNames(), db.any(sql)])
     .then(([machines, events]) => {
       if (machines.length === 0) return 'No paired machines'
 
@@ -52,7 +52,7 @@ function status () {
   order by created desc
   limit 1`
 
-  return Promise.all([checkWasConfigured(), db.$oneOrNone(sql, ['ping']), machinesLastPing()])
+  return Promise.all([checkWasConfigured(), db.oneOrNone(sql, ['ping']), machinesLastPing()])
     .then(([wasConfigured, statusRow, machineStatus]) => {
       const age = statusRow && moment.duration(statusRow.age, 'seconds')
       const up = statusRow ? statusRow.age < CONSIDERED_UP_SECS : false
diff --git a/lib/admin/settings-loader.js b/lib/admin/settings-loader.js
index 204e7ace..eccd677f 100644
--- a/lib/admin/settings-loader.js
+++ b/lib/admin/settings-loader.js
@@ -70,7 +70,7 @@ function loadConfig (versionId) {
   where id=$1 and type=$2 and schema_version=$3
   and valid`
 
-  return db.$one(sql, [versionId, 'config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.one(sql, [versionId, 'config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row.data.config)
     .then(configValidate.validate)
     .catch(err => {
@@ -92,7 +92,7 @@ function loadLatestConfig (filterSchemaVersion = true) {
   order by id desc
   limit 1`
 
-  return db.$one(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.one(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row.data.config)
     .then(configValidate.validate)
     .catch(err => {
@@ -113,7 +113,7 @@ function loadRecentConfig () {
   order by id desc
   limit 1`
 
-  return db.$one(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.one(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row.data.config)
 }
 
@@ -121,7 +121,7 @@ function loadAccounts (filterSchemaVersion = true) {
   const toFields = fieldArr => _.fromPairs(_.map(r => [r.code, r.value], fieldArr))
   const toPairs = r => [r.code, toFields(r.fields)]
 
-  return db.$oneOrNone(`select data from user_config where type=$1 ${filterSchemaVersion ? 'and schema_version=$2' : ''}`, ['accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.oneOrNone(`select data from user_config where type=$1 ${filterSchemaVersion ? 'and schema_version=$2' : ''}`, ['accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(function (data) {
       if (!data) return {}
       return _.fromPairs(_.map(toPairs, data.data.accounts))
@@ -136,8 +136,8 @@ function save (config) {
   const sql = 'insert into user_config (type, data, valid) values ($1, $2, $3)'
 
   return configValidate.validate(config)
-    .then(() => db.$none(sql, ['config', {config}, true]))
-    .catch(() => db.$none(sql, ['config', {config}, false]))
+    .then(() => db.none(sql, ['config', {config}, true]))
+    .catch(() => db.none(sql, ['config', {config}, false]))
 }
 
 function configAddField (scope, fieldCode, fieldType, fieldClass, value) {
diff --git a/lib/admin/transactions.js b/lib/admin/transactions.js
index c3b36241..7ae7ceea 100644
--- a/lib/admin/transactions.js
+++ b/lib/admin/transactions.js
@@ -37,7 +37,7 @@ function batch () {
   from cash_out_txs
   order by created desc limit $1`
 
-  return Promise.all([db.$any(cashInSql, [cashInTx.PENDING_INTERVAL, NUM_RESULTS]), db.$any(cashOutSql, [NUM_RESULTS, REDEEMABLE_AGE])])
+  return Promise.all([db.any(cashInSql, [cashInTx.PENDING_INTERVAL, NUM_RESULTS]), db.any(cashOutSql, [NUM_RESULTS, REDEEMABLE_AGE])])
     .then(packager)
 }
 
@@ -57,8 +57,8 @@ function single (txId) {
   where id=$1`
 
   return Promise.all([
-    db.$oneOrNone(cashInSql, [cashInTx.PENDING_INTERVAL, txId]),
-    db.$oneOrNone(cashOutSql, [txId, REDEEMABLE_AGE])
+    db.oneOrNone(cashInSql, [cashInTx.PENDING_INTERVAL, txId]),
+    db.oneOrNone(cashOutSql, [txId, REDEEMABLE_AGE])
   ])
     .then(packager)
     .then(_.head)
diff --git a/lib/auth-tokens.js b/lib/auth-tokens.js
index 30d9c389..d42fa1b1 100644
--- a/lib/auth-tokens.js
+++ b/lib/auth-tokens.js
@@ -7,7 +7,7 @@ function createAuthToken (userID, type) {
   const token = crypto.randomBytes(32).toString('hex')
   const sql = `INSERT INTO auth_tokens (token, type, user_id) VALUES ($1, $2, $3) ON CONFLICT (user_id, type) DO UPDATE SET token=$1, expire=now() + interval '${constants.AUTH_TOKEN_EXPIRATION_TIME}' RETURNING *`
 
-  return db.$one(sql, [token, type, userID])
+  return db.one(sql, [token, type, userID])
 }
 
 module.exports = {
diff --git a/lib/blacklist.js b/lib/blacklist.js
index e3daa197..4c3d8595 100644
--- a/lib/blacklist.js
+++ b/lib/blacklist.js
@@ -3,7 +3,7 @@ const notifierQueries = require('./notifier/queries')
 
 // Get all blacklist rows from the DB "blacklist" table that were manually inserted by the operator
 const getBlacklist = () => {
-  return db.$any(`SELECT * FROM blacklist`).then(res =>
+  return db.any(`SELECT * FROM blacklist`).then(res =>
     res.map(item => ({
       cryptoCode: item.crypto_code,
       address: item.address
@@ -15,12 +15,12 @@ const getBlacklist = () => {
 const deleteFromBlacklist = (cryptoCode, address) => {
   const sql = `DELETE FROM blacklist WHERE crypto_code = $1 AND address = $2`
   notifierQueries.clearBlacklistNotification(cryptoCode, address)
-  return db.$none(sql, [cryptoCode, address])
+  return db.none(sql, [cryptoCode, address])
 }
 
 const insertIntoBlacklist = (cryptoCode, address) => {
   return db
-    .$none(
+    .none(
       'INSERT INTO blacklist (crypto_code, address) VALUES ($1, $2);',
       [cryptoCode, address]
     )
@@ -28,7 +28,7 @@ const insertIntoBlacklist = (cryptoCode, address) => {
 
 function blocked (address, cryptoCode) {
   const sql = `SELECT * FROM blacklist WHERE address = $1 AND crypto_code = $2`
-  return db.$any(sql, [address, cryptoCode])
+  return db.any(sql, [address, cryptoCode])
 }
 
 function addToUsedAddresses (address, cryptoCode) {
@@ -36,7 +36,7 @@ function addToUsedAddresses (address, cryptoCode) {
   if (cryptoCode === 'ETH') return Promise.resolve()
 
   const sql = `INSERT INTO blacklist (crypto_code, address) VALUES ($1, $2)`
-  return db.$oneOrNone(sql, [cryptoCode, address])
+  return db.oneOrNone(sql, [cryptoCode, address])
 }
 
 module.exports = {
diff --git a/lib/cash-in/cash-in-atomic.js b/lib/cash-in/cash-in-atomic.js
index c7085b17..8a23360c 100644
--- a/lib/cash-in/cash-in-atomic.js
+++ b/lib/cash-in/cash-in-atomic.js
@@ -16,11 +16,11 @@ function atomic (machineTx, pi) {
     const sql = 'select * from cash_in_txs where id=$1'
     const sql2 = 'select * from bills where cash_in_txs_id=$1'
 
-    return t.$oneOrNone(sql, [machineTx.id])
+    return t.oneOrNone(sql, [machineTx.id])
       .then(row => {
         if (row && row.tx_version >= machineTx.txVersion) throw new E.StaleTxError('Stale tx')
 
-        return t.$any(sql2, [machineTx.id])
+        return t.any(sql2, [machineTx.id])
           .then(billRows => {
             const dbTx = cashInLow.toObj(row)
 
@@ -47,9 +47,9 @@ function insertNewBills (t, billRows, machineTx) {
   const sql2 = `update devices set cashbox = cashbox + $2
   where device_id = $1`
 
-  return t.$none(sql2, [deviceID, dbBills.length])
+  return t.none(sql2, [deviceID, dbBills.length])
     .then(() => {
-      return t.$none(sql)
+      return t.none(sql)
     })
     .then(() => bills)
 }
diff --git a/lib/cash-in/cash-in-low.js b/lib/cash-in/cash-in-low.js
index 56c4efe7..79e726b5 100644
--- a/lib/cash-in/cash-in-low.js
+++ b/lib/cash-in/cash-in-low.js
@@ -61,7 +61,7 @@ function upsert (t, dbTx, preProcessedTx) {
 function insert (t, tx) {
   const dbTx = massage(tx)
   const sql = pgp.helpers.insert(dbTx, null, 'cash_in_txs') + ' returning *'
-  return t.$one(sql)
+  return t.one(sql)
     .then(toObj)
 }
 
@@ -72,7 +72,7 @@ function update (t, tx, changes) {
   const sql = pgp.helpers.update(dbChanges, null, 'cash_in_txs') +
     pgp.as.format(' where id=$1', [tx.id]) + ' returning *'
 
-  return t.$one(sql)
+  return t.one(sql)
     .then(toObj)
 }
 
diff --git a/lib/cash-in/cash-in-tx.js b/lib/cash-in/cash-in-tx.js
index 44abcf31..55962757 100644
--- a/lib/cash-in/cash-in-tx.js
+++ b/lib/cash-in/cash-in-tx.js
@@ -69,7 +69,7 @@ function logAction (rec, tx) {
 
   const sql = pgp.helpers.insert(action, null, 'cash_in_actions')
 
-  return db.$none(sql)
+  return db.none(sql)
     .then(_.constant(rec))
 }
 
@@ -77,7 +77,7 @@ function logActionById (action, _rec, txId) {
   const rec = _.assign(_rec, { action, tx_id: txId })
   const sql = pgp.helpers.insert(rec, null, 'cash_in_actions')
 
-  return db.$none(sql)
+  return db.none(sql)
 }
 
 function checkForBlacklisted (tx) {
@@ -165,7 +165,7 @@ function monitorPending (settings) {
       .catch(logger.error)
   }
 
-  return db.$any(sql, [PENDING_INTERVAL, MAX_PENDING])
+  return db.any(sql, [PENDING_INTERVAL, MAX_PENDING])
     .then(rows => pEachSeries(rows, row => processPending(row)))
     .catch(logger.error)
 }
@@ -182,7 +182,7 @@ function cancel (txId) {
       return pgp.helpers.update(updateRec, null, 'cash_in_txs') +
       pgp.as.format(' where id=$1', [txId])
     })
-    .then(sql => db.$result(sql, false))
+    .then(sql => db.result(sql, false))
     .then(res => {
       if (res.rowCount !== 1) throw new Error('No such tx-id')
     })
diff --git a/lib/cash-out/cash-out-actions.js b/lib/cash-out/cash-out-actions.js
index ee89a408..420e0ae9 100644
--- a/lib/cash-out/cash-out-actions.js
+++ b/lib/cash-out/cash-out-actions.js
@@ -14,14 +14,14 @@ function logActionById (t, action, _rec, txId) {
   const rec = _.assign(_rec, {action, tx_id: txId, redeem: false})
   const sql = pgp.helpers.insert(rec, null, 'cash_out_actions')
 
-  return t.$none(sql)
+  return t.none(sql)
 }
 
 function logAction (t, action, _rec, tx) {
   const rec = _.assign(_rec, {action, tx_id: tx.id, redeem: !!tx.redeem, device_id: tx.deviceId})
   const sql = pgp.helpers.insert(rec, null, 'cash_out_actions')
 
-  return t.$none(sql)
+  return t.none(sql)
     .then(_.constant(tx))
 }
 
diff --git a/lib/cash-out/cash-out-atomic.js b/lib/cash-out/cash-out-atomic.js
index 9f470f0e..b03d51f5 100644
--- a/lib/cash-out/cash-out-atomic.js
+++ b/lib/cash-out/cash-out-atomic.js
@@ -20,7 +20,7 @@ function atomic (tx, pi, fromClient) {
   const mode = new TransactionMode({ tiLevel: isolationLevel.serializable })
   function transaction (t) {
     const sql = 'select * from cash_out_txs where id=$1'
-    return t.$oneOrNone(sql, [tx.id])
+    return t.oneOrNone(sql, [tx.id])
       .then(toObj)
       .then(oldTx => {
         const isStale = fromClient && oldTx && (oldTx.txVersion >= tx.txVersion)
@@ -99,7 +99,7 @@ function preProcess (t, oldTx, newTx, pi) {
 function nextHd (t, isHd, tx) {
   if (!isHd) return Promise.resolve(tx)
 
-  return t.$one("select nextval('hd_indices_seq') as hd_index")
+  return t.one("select nextval('hd_indices_seq') as hd_index")
     .then(row => _.set('hdIndex', row.hd_index, tx))
 }
 
@@ -118,7 +118,7 @@ function updateCassettes (t, tx) {
     tx.deviceId
   ]
 
-  return t.$one(sql, values)
+  return t.one(sql, values)
     .then(r => socket.emit(_.assign(r, {op: 'cassetteUpdate', deviceId: tx.deviceId})))
 }
 
diff --git a/lib/cash-out/cash-out-helper.js b/lib/cash-out/cash-out-helper.js
index fc49502f..0ef9747a 100644
--- a/lib/cash-out/cash-out-helper.js
+++ b/lib/cash-out/cash-out-helper.js
@@ -111,6 +111,6 @@ function redeemableTxs (deviceId) {
   and provisioned_1 is not null
   and (extract(epoch from (now() - greatest(created, confirmed_at))) * 1000) < $4`
 
-  return db.$any(sql, [deviceId, true, false, REDEEMABLE_AGE])
+  return db.any(sql, [deviceId, true, false, REDEEMABLE_AGE])
     .then(_.map(toObj))
 }
diff --git a/lib/cash-out/cash-out-low.js b/lib/cash-out/cash-out-low.js
index f61c01fa..b5fdd22c 100644
--- a/lib/cash-out/cash-out-low.js
+++ b/lib/cash-out/cash-out-low.js
@@ -26,7 +26,7 @@ function insert (t, tx) {
   const dbTx = toDb(tx)
 
   const sql = pgp.helpers.insert(dbTx, null, 'cash_out_txs') + ' returning *'
-  return t.$one(sql)
+  return t.one(sql)
     .then(toObj)
 }
 
@@ -39,7 +39,7 @@ function update (t, tx, changes) {
 
   const newTx = _.merge(tx, changes)
 
-  return t.$none(sql)
+  return t.none(sql)
     .then(() => newTx)
 }
 
diff --git a/lib/cash-out/cash-out-tx.js b/lib/cash-out/cash-out-tx.js
index fc306f9b..ed86428d 100644
--- a/lib/cash-out/cash-out-tx.js
+++ b/lib/cash-out/cash-out-tx.js
@@ -103,7 +103,7 @@ function fetchOpenTxs (statuses, fromAge, toAge, applyFilter, coinFilter) {
   const coinClause = _.map(pgp.as.text, coinFilter).join(',')
   const statusClause = _.map(pgp.as.text, statuses).join(',')
 
-  return db.$any(sql, [fromAge, toAge, coinClause, statusClause])
+  return db.any(sql, [fromAge, toAge, coinClause, statusClause])
     .then(rows => rows.map(toObj))
 }
 
@@ -151,7 +151,7 @@ function monitorUnnotified (settings) {
   and (redeem=$4 or ((extract(epoch from (now() - created))) * 1000)>$5)`
 
   const notify = tx => plugins(settings, tx.deviceId).notifyConfirmation(tx)
-  return db.$any(sql, [MAX_NOTIFY_AGE, false, false, true, MIN_NOTIFY_AGE])
+  return db.any(sql, [MAX_NOTIFY_AGE, false, false, true, MIN_NOTIFY_AGE])
     .then(rows => _.map(toObj, rows))
     .then(txs => Promise.all(txs.map(notify)))
     .catch(logger.error)
@@ -169,7 +169,7 @@ function cancel (txId) {
       return pgp.helpers.update(updateRec, null, 'cash_out_txs') +
       pgp.as.format(' where id=$1', [txId])
     })
-    .then(sql => db.$result(sql, false))
+    .then(sql => db.result(sql, false))
     .then(res => {
       if (res.rowCount !== 1) throw new Error('No such tx-id')
     })
diff --git a/lib/coinatmradar/coinatmradar.js b/lib/coinatmradar/coinatmradar.js
index dcec45fa..f90e03e7 100644
--- a/lib/coinatmradar/coinatmradar.js
+++ b/lib/coinatmradar/coinatmradar.js
@@ -108,7 +108,7 @@ function getMachines (rates, settings) {
   where display=TRUE and
   paired=TRUE
   order by created`
-  return db.$any(sql, [STALE_INTERVAL])
+  return db.any(sql, [STALE_INTERVAL])
     .then(_.map(_.partial(mapMachine, [rates, settings])))
 }
 
diff --git a/lib/coinatmradar/test/coinatmradar.test.js b/lib/coinatmradar/test/coinatmradar.test.js
index f824b9d6..3b5eb832 100644
--- a/lib/coinatmradar/test/coinatmradar.test.js
+++ b/lib/coinatmradar/test/coinatmradar.test.js
@@ -260,6 +260,6 @@ test('Verify axios request schema', async () => {
     )
   )
 
-  db.$any.mockResolvedValue(dbResponse)
+  db.any.mockResolvedValue(dbResponse)
   await car.update(rates, settings)
 })
diff --git a/lib/compliance.js b/lib/compliance.js
index fd2caa86..22562587 100644
--- a/lib/compliance.js
+++ b/lib/compliance.js
@@ -11,7 +11,7 @@ function logSanctionsMatch (deviceId, customer, sanctionsId, alias) {
   values
   ($1, $2, $3, $4, $5, $6)`
 
-  return db.$none(sql, [uuid.v4(), deviceId, sanctionsId, alias.id, alias.fullName, customer.id])
+  return db.none(sql, [uuid.v4(), deviceId, sanctionsId, alias.id, alias.fullName, customer.id])
 }
 
 function logSanctionsMatches (deviceId, customer, results) {
diff --git a/lib/compliance_overrides.js b/lib/compliance_overrides.js
index 8a49a544..f84fe0d1 100644
--- a/lib/compliance_overrides.js
+++ b/lib/compliance_overrides.js
@@ -20,7 +20,7 @@ function add (complianceOverride) {
    override_by, 
    verification) 
    values ($1, $2, $3, now(), $4, $5) returning *`
-  return db.$one(sql, [
+  return db.one(sql, [
     uuid.v4(),
     complianceOverride.customerId,
     complianceOverride.complianceType,
diff --git a/lib/customers.js b/lib/customers.js
index a9eeacf8..bd410744 100644
--- a/lib/customers.js
+++ b/lib/customers.js
@@ -34,7 +34,7 @@ const operatorDataDir = _.get('operatorDataDir', options)
  */
 function add (customer) {
   const sql = 'insert into customers (id, phone, phone_at) values ($1, $2, now()) returning *'
-  return db.$one(sql, [uuid.v4(), customer.phone])
+  return db.one(sql, [uuid.v4(), customer.phone])
     .then(populateOverrideUsernames)
     .then(computeStatus)
     .then(populateDailyVolume)
@@ -54,7 +54,7 @@ function add (customer) {
  */
 function get (phone) {
   const sql = 'select * from customers where phone=$1'
-  return db.$oneOrNone(sql, [phone])
+  return db.oneOrNone(sql, [phone])
     .then(populateDailyVolume)
     .then(camelize)
 }
@@ -80,7 +80,7 @@ function update (id, data, userToken, txId) {
   const sql = Pgp.helpers.update(updateData, _.keys(updateData), 'customers') +
     ' where id=$1 returning *'
 
-  return db.$one(sql, [id])
+  return db.one(sql, [id])
     .then(addComplianceOverrides(id, updateData, userToken))
     .then(populateOverrideUsernames)
     .then(computeStatus)
@@ -120,7 +120,7 @@ async function updateCustomer (id, data, userToken) {
     ' where id=$1'
   invalidateCustomerNotifications(id, formattedData)
 
-  await db.$none(sql, [id])
+  await db.none(sql, [id])
 
   return getCustomerById(id)
 }
@@ -145,7 +145,7 @@ const invalidateCustomerNotifications = (id, data) => {
  */
 function getById (id, userToken) {
   const sql = 'select * from customers where id=$1'
-  return db.$oneOrNone(sql, [id])
+  return db.oneOrNone(sql, [id])
     .then(populateOverrideUsernames)
     .then(computeStatus)
     .then(populateDailyVolume)
@@ -174,10 +174,10 @@ function getDailyVolume (id, txId) {
 
 function getDailyVolumeQueries (id) {
   return [
-    db.$one(`select coalesce(sum(fiat), 0) as total, max(created) as maxdate from cash_in_txs
+    db.one(`select coalesce(sum(fiat), 0) as total, max(created) as maxdate from cash_in_txs
           where customer_id=$1
           and created > now() - interval '1 day'`, [id]),
-    db.$one(`select coalesce(sum(fiat), 0) as total, max(created) as maxdate from cash_out_txs
+    db.one(`select coalesce(sum(fiat), 0) as total, max(created) as maxdate from cash_out_txs
           where customer_id=$1
           and created > now() - interval '1 day'`, [id])
   ]
@@ -185,11 +185,11 @@ function getDailyVolumeQueries (id) {
 
 function getDailyVolumeMinusCurrentTxQueries (id, txId) {
   return [
-    db.$one(`select coalesce(sum(fiat), 0) as total, max(created) as maxdate from cash_in_txs
+    db.one(`select coalesce(sum(fiat), 0) as total, max(created) as maxdate from cash_in_txs
           where customer_id=$1
           and id!=$2
           and created > now() - interval '1 day'`, [id, txId]),
-    db.$one(`select coalesce(sum(fiat), 0) as total, max(created) as maxdate from cash_out_txs
+    db.one(`select coalesce(sum(fiat), 0) as total, max(created) as maxdate from cash_out_txs
           where customer_id=$1
           and id!=$2
           and created > now() - interval '1 day'`, [id, txId])
@@ -432,7 +432,7 @@ function batch () {
   const sql = `select * from customers
   where id != $1
   order by created desc limit $2`
-  return db.$any(sql, [ anonymous.uuid, NUM_RESULTS ])
+  return db.any(sql, [ anonymous.uuid, NUM_RESULTS ])
     .then(customers => Promise.all(_.map(customer => {
       return populateOverrideUsernames(customer)
         .then(computeStatus)
@@ -475,7 +475,7 @@ function getCustomersList () {
     where c.id != $1
   ) as cl where rn = 1
   limit $2`
-  return db.$any(sql, [ anonymous.uuid, NUM_RESULTS ])
+  return db.any(sql, [ anonymous.uuid, NUM_RESULTS ])
     .then(customers => Promise.all(_.map(customer => {
       return populateOverrideUsernames(customer)
         .then(camelize)
@@ -513,7 +513,7 @@ function getCustomerById (id) {
       from cash_out_txs where confirmed_at is not null) t on c.id = t.customer_id
     where c.id = $1
   ) as cl where rn = 1`
-  return db.$oneOrNone(sql, [id])
+  return db.oneOrNone(sql, [id])
     .then(populateOverrideUsernames)
     .then(camelize)
 }
diff --git a/lib/db-migrate-store.js b/lib/db-migrate-store.js
index ebc56a7e..3c28afab 100644
--- a/lib/db-migrate-store.js
+++ b/lib/db-migrate-store.js
@@ -10,11 +10,11 @@ DbMigrateStore.prototype.save = function (set, fn) {
     lastRun: set.lastRun,
     migrations: set.migrations
   })
-  db.$none(upsert, [insertData]).then(fn).catch(err => console.log(err))
+  db.none(upsert, [insertData]).then(fn).catch(err => console.log(err))
 }
 
 DbMigrateStore.prototype.load = function (fn) {
-  db.$one('select data from migrations').then(({ data }) => {
+  db.one('select data from migrations').then(({ data }) => {
     fn(null, data)
   })
 }
diff --git a/lib/db.js b/lib/db.js
index fbcf3387..2dd43bd6 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -93,7 +93,7 @@ eventBus.subscribe('log', args => {
   // because this module is imported before ALS is set up on app.js
   const store = defaultStore()
   asyncLocalStorage.run(store, () => {
-    db.$one(sql, [uuid.v4(), '', msgToSave, level, meta])
+    db.one(sql, [uuid.v4(), '', msgToSave, level, meta])
       .then(_.mapKeys(_.camelCase))
   })
 })
diff --git a/lib/logs.js b/lib/logs.js
index 53d31163..60df7704 100644
--- a/lib/logs.js
+++ b/lib/logs.js
@@ -22,7 +22,7 @@ function getLastSeen (deviceId) {
   const sql = `select id, timestamp, serial from logs
   where device_id=$1
   order by timestamp desc, serial desc limit 1`
-  return db.$oneOrNone(sql, [deviceId])
+  return db.oneOrNone(sql, [deviceId])
     .then(log => log ? {timestamp: log.timestamp, serial: log.serial, id: log.id} : null)
 }
 
@@ -56,14 +56,14 @@ function update (deviceId, logLines) {
   }, logLines)
   const sql = pgp.helpers.insert(logs, cs) + 'on conflict do nothing'
 
-  return db.$none(sql)
+  return db.none(sql)
 }
 
 function clearOldLogs () {
   const sql = `delete from logs
     where timestamp < now() - interval '3 days'`
 
-  return db.$none(sql)
+  return db.none(sql)
 }
 
 function getUnlimitedMachineLogs (deviceId, until = new Date().toISOString()) {
@@ -75,7 +75,7 @@ function getUnlimitedMachineLogs (deviceId, until = new Date().toISOString()) {
   and timestamp > (timestamp $2 - interval '2 days')
   order by timestamp desc, serial desc`
 
-  return Promise.all([db.$any(sql, [ deviceId, until ]), getMachineName(deviceId)])
+  return Promise.all([db.any(sql, [ deviceId, until ]), getMachineName(deviceId)])
     .then(([logs, machineName]) => ({
       logs: _.map(_.mapKeys(_.camelCase), logs),
       currentMachine: {deviceId, name: machineName}
@@ -90,7 +90,7 @@ function getMachineLogs (deviceId, until = new Date().toISOString(), limit = nul
   limit $3
   offset $4`
 
-  return Promise.all([db.$any(sql, [ deviceId, until, limit, offset ]), getMachineName(deviceId)])
+  return Promise.all([db.any(sql, [ deviceId, until, limit, offset ]), getMachineName(deviceId)])
     .then(([logs, machineName]) => ({
       logs: _.map(_.mapKeys(_.camelCase), logs),
       currentMachine: {deviceId, name: machineName}
@@ -106,7 +106,7 @@ function simpleGetMachineLogs (deviceId, from = new Date(0).toISOString(), until
   limit $4
   offset $5`
 
-  return db.$any(sql, [ deviceId, from, until, limit, offset ])
+  return db.any(sql, [ deviceId, from, until, limit, offset ])
     .then(_.map(_.mapKeys(_.camelCase)))
 }
 
diff --git a/lib/machine-loader.js b/lib/machine-loader.js
index 9cd9b1c7..b449e68b 100644
--- a/lib/machine-loader.js
+++ b/lib/machine-loader.js
@@ -11,7 +11,7 @@ const notifierUtils = require('./notifier/utils')
 const notifierQueries = require('./notifier/queries')
 
 function getMachines () {
-  return db.$any('SELECT * FROM devices WHERE display=TRUE ORDER BY created')
+  return db.any('SELECT * FROM devices WHERE display=TRUE ORDER BY created')
     .then(rr => rr.map(r => ({
       deviceId: r.device_id,
       cashbox: r.cashbox,
@@ -83,34 +83,34 @@ function getMachineNames (config) {
  */
 function getMachineName (machineId) {
   const sql = 'SELECT * FROM devices WHERE device_id=$1'
-  return db.$oneOrNone(sql, [machineId])
+  return db.oneOrNone(sql, [machineId])
     .then(it => it.name)
 }
 
 function getMachine (machineId) {
   const sql = 'SELECT * FROM devices WHERE device_id=$1'
-  return db.$oneOrNone(sql, [machineId]).then(res => _.mapKeys(_.camelCase)(res))
+  return db.oneOrNone(sql, [machineId]).then(res => _.mapKeys(_.camelCase)(res))
 }
 
 function renameMachine (rec) {
   const sql = 'UPDATE devices SET name=$1 WHERE device_id=$2'
-  return db.$none(sql, [rec.newName, rec.deviceId])
+  return db.none(sql, [rec.newName, rec.deviceId])
 }
 
 function resetCashOutBills (rec) {
   const detailB = notifierUtils.buildDetail({ deviceId: rec.deviceId })
   const sql = `UPDATE devices SET cassette1=$1, cassette2=$2 WHERE device_id=$3;`
-  return db.$none(sql, [rec.cassettes[0], rec.cassettes[1], rec.deviceId]).then(() => notifierQueries.invalidateNotification(detailB, 'fiatBalance'))
+  return db.none(sql, [rec.cassettes[0], rec.cassettes[1], rec.deviceId]).then(() => notifierQueries.invalidateNotification(detailB, 'fiatBalance'))
 }
 
 function emptyCashInBills (rec) {
   const sql = 'UPDATE devices SET cashbox=0 WHERE device_id=$1'
-  return db.$none(sql, [rec.deviceId])
+  return db.none(sql, [rec.deviceId])
 }
 
 function setCassetteBills (rec) {
   const sql = 'update devices set cashbox=$1, cassette1=$2, cassette2=$3 where device_id=$4'
-  return db.$none(sql, [rec.cashbox, rec.cassettes[0], rec.cassettes[1], rec.deviceId])
+  return db.none(sql, [rec.cashbox, rec.cassettes[0], rec.cassettes[1], rec.deviceId])
 }
 
 function unpair (rec) {
diff --git a/lib/compute-schema.js b/lib/middlewares/compute-schema.js
similarity index 69%
rename from lib/compute-schema.js
rename to lib/middlewares/compute-schema.js
index 00b6d332..cc90a139 100644
--- a/lib/compute-schema.js
+++ b/lib/middlewares/compute-schema.js
@@ -1,4 +1,4 @@
-const { asyncLocalStorage, defaultStore } = require('./async-storage')
+const { asyncLocalStorage, defaultStore } = require('../async-storage')
 
 const computeSchema = (req, res, next) => {
   const store = defaultStore()
diff --git a/lib/new-admin/services/login.js b/lib/new-admin/services/login.js
index 0dfca6a4..8eb19c53 100644
--- a/lib/new-admin/services/login.js
+++ b/lib/new-admin/services/login.js
@@ -2,8 +2,8 @@ const db = require('../../db')
 
 function validateUser (username, password) {
   return db.tx(t => {
-    const q1 = t.$one('SELECT * FROM users WHERE username=$1 AND password=$2', [username, password])
-    const q2 = t.$none('UPDATE users SET last_accessed = now() WHERE username=$1', [username])
+    const q1 = t.one('SELECT * FROM users WHERE username=$1 AND password=$2', [username, password])
+    const q2 = t.none('UPDATE users SET last_accessed = now() WHERE username=$1', [username])
 
     return t.batch([q1, q2])
       .then(([user]) => user)
diff --git a/lib/new-admin/services/pairing.js b/lib/new-admin/services/pairing.js
index 7fe03ed5..ffe2ceed 100644
--- a/lib/new-admin/services/pairing.js
+++ b/lib/new-admin/services/pairing.js
@@ -25,7 +25,7 @@ function totem (name) {
       const buf = Buffer.concat([caHash, token, Buffer.from(options.hostname)])
       const sql = 'insert into pairing_tokens (token, name) values ($1, $3), ($2, $3)'
 
-      return db.$none(sql, [hexToken, caHexToken, name])
+      return db.none(sql, [hexToken, caHexToken, name])
         .then(() => bsAlpha.encode(buf))
     })
 }
diff --git a/lib/new-admin/services/server-logs.js b/lib/new-admin/services/server-logs.js
index 6631a039..80d93c7f 100644
--- a/lib/new-admin/services/server-logs.js
+++ b/lib/new-admin/services/server-logs.js
@@ -10,7 +10,7 @@ function getServerLogs (from = new Date(0).toISOString(), until = new Date().toI
   limit $3
   offset $4`
 
-  return db.$any(sql, [ from, until, limit, offset ])
+  return db.any(sql, [ from, until, limit, offset ])
     .then(_.map(_.mapKeys(_.camelCase)))
 }
 
diff --git a/lib/new-admin/services/transactions.js b/lib/new-admin/services/transactions.js
index 487d9214..6a64b148 100644
--- a/lib/new-admin/services/transactions.js
+++ b/lib/new-admin/services/transactions.js
@@ -93,8 +93,8 @@ function batch (
   ORDER BY created DESC limit $4 offset $5`
 
   return Promise.all([
-    db.$any(cashInSql, [cashInTx.PENDING_INTERVAL, from, until, limit, offset, id, txClass, machineName, customerName, fiatCode, cryptoCode, toAddress, status]),
-    db.$any(cashOutSql, [REDEEMABLE_AGE, from, until, limit, offset, id, txClass, machineName, customerName, fiatCode, cryptoCode, toAddress, status])
+    db.any(cashInSql, [cashInTx.PENDING_INTERVAL, from, until, limit, offset, id, txClass, machineName, customerName, fiatCode, cryptoCode, toAddress, status]),
+    db.any(cashOutSql, [REDEEMABLE_AGE, from, until, limit, offset, id, txClass, machineName, customerName, fiatCode, cryptoCode, toAddress, status])
   ])
     .then(packager)
 }
@@ -136,8 +136,8 @@ function getCustomerTransactionsBatch (ids) {
   WHERE c.id IN ($1^)
   ORDER BY created DESC limit $2`
   return Promise.all([
-    db.$any(cashInSql, [_.map(pgp.as.text, ids).join(','), cashInTx.PENDING_INTERVAL, NUM_RESULTS]),
-    db.$any(cashOutSql, [_.map(pgp.as.text, ids).join(','), NUM_RESULTS, REDEEMABLE_AGE])
+    db.any(cashInSql, [_.map(pgp.as.text, ids).join(','), cashInTx.PENDING_INTERVAL, NUM_RESULTS]),
+    db.any(cashOutSql, [_.map(pgp.as.text, ids).join(','), NUM_RESULTS, REDEEMABLE_AGE])
   ])
     .then(packager).then(transactions => {
       const transactionMap = _.groupBy('customerId', transactions)
@@ -180,8 +180,8 @@ function single (txId) {
   WHERE id=$1`
 
   return Promise.all([
-    db.$oneOrNone(cashInSql, [cashInTx.PENDING_INTERVAL, txId]),
-    db.$oneOrNone(cashOutSql, [txId, REDEEMABLE_AGE])
+    db.oneOrNone(cashInSql, [cashInTx.PENDING_INTERVAL, txId]),
+    db.oneOrNone(cashOutSql, [txId, REDEEMABLE_AGE])
   ])
     .then(packager)
     .then(_.head)
diff --git a/lib/new-settings-loader.js b/lib/new-settings-loader.js
index 6dfc3892..1be04445 100644
--- a/lib/new-settings-loader.js
+++ b/lib/new-settings-loader.js
@@ -25,11 +25,11 @@ function saveAccounts (accounts) {
   return loadAccounts()
     .then(currentAccounts => {
       const newAccounts = _.merge(currentAccounts, accounts)
-      return db.$none(accountsSql, ['accounts', { accounts: newAccounts }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION])
+      return db.none(accountsSql, ['accounts', { accounts: newAccounts }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION])
     })
 }
 function resetAccounts (schemaVersion) {
-  return db.$none(
+  return db.none(
     accountsSql,
     [
       'accounts',
@@ -49,7 +49,7 @@ function loadAccounts (schemaVersion) {
   order by id desc
   limit 1`
 
-  return db.$oneOrNone(sql, ['accounts', schemaVersion || NEW_SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.oneOrNone(sql, ['accounts', schemaVersion || NEW_SETTINGS_LOADER_SCHEMA_VERSION])
     .then(_.compose(_.defaultTo({}), _.get('data.accounts')))
 }
 
@@ -70,12 +70,12 @@ function saveConfig (config) {
   return loadLatestConfigOrNone()
     .then(currentConfig => {
       const newConfig = _.assign(currentConfig, config)
-      return db.$none(configSql, ['config', { config: newConfig }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION])
+      return db.none(configSql, ['config', { config: newConfig }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION])
     })
 }
 
 function resetConfig (schemaVersion) {
-  return db.$none(
+  return db.none(
     configSql, 
     [
       'config',
@@ -103,7 +103,7 @@ function loadLatestConfig () {
   order by id desc
   limit 1`
   
-  return db.$one(sql, ['config', NEW_SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.one(sql, ['config', NEW_SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row ? row.data.config : {})
     .catch(err => {
       throw err
@@ -118,7 +118,7 @@ function loadLatestConfigOrNone (schemaVersion) {
   order by id desc
   limit 1`
   
-  return db.$oneOrNone(sql, ['config', schemaVersion || NEW_SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.oneOrNone(sql, ['config', schemaVersion || NEW_SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row ? row.data.config : {})
 }
 
@@ -130,7 +130,7 @@ function loadConfig (versionId) {
   and schema_version=$3
   and valid`
 
-  return db.$one(sql, [versionId, 'config', NEW_SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.one(sql, [versionId, 'config', NEW_SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row.data.config)
     .catch(err => {
       if (err.name === 'QueryResultError') {
diff --git a/lib/notifier/queries.js b/lib/notifier/queries.js
index e418bc98..bfa71742 100644
--- a/lib/notifier/queries.js
+++ b/lib/notifier/queries.js
@@ -7,7 +7,6 @@ const db = require('../db')
 
 // types of notifications able to be inserted into db:
 /*
-transaction - for normal transactions
 highValueTransaction - for transactions of value higher than threshold
 fiatBalance - when the number of notes in cash cassettes falls below threshold
 cryptoBalance - when ammount of crypto balance in fiat falls below or above low/high threshold
@@ -17,65 +16,65 @@ error - notifications related to errors
 
 function getMachineName (machineId) {
   const sql = 'SELECT * FROM devices WHERE device_id=$1'
-  return db.$oneOrNone(sql, [machineId])
+  return db.oneOrNone(sql, [machineId])
     .then(it => it.name).catch(console.error)
 }
 
 const addNotification = (type, message, detail) => {
   const sql = `INSERT INTO notifications (id, type, message, detail) VALUES ($1, $2, $3, $4)`
-  return db.$oneOrNone(sql, [uuidv4(), type, message, detail]).catch(console.error)
+  return db.oneOrNone(sql, [uuidv4(), type, message, detail]).catch(console.error)
 }
 
 const getAllValidNotifications = (type) => {
   const sql = `SELECT * FROM notifications WHERE type = $1 AND valid = 't'`
-  return db.$any(sql, [type]).catch(console.error)
+  return db.any(sql, [type]).catch(console.error)
 }
 
 const invalidateNotification = (detail, type) => {
   detail = _.omitBy(_.isEmpty, detail)
   const sql = `UPDATE notifications SET valid = 'f', read = 't' WHERE valid = 't' AND type = $1 AND detail::jsonb @> $2::jsonb`
-  return db.$none(sql, [type, detail]).catch(console.error).catch(console.error)
+  return db.none(sql, [type, detail]).catch(console.error).catch(console.error)
 }
 
 const batchInvalidate = (ids) => {
   const formattedIds = _.map(pgp.as.text, ids).join(',')
   const sql = `UPDATE notifications SET valid = 'f', read = 't' WHERE id IN ($1^)`
-  return db.$none(sql, [formattedIds]).catch(console.error)
+  return db.none(sql, [formattedIds]).catch(console.error)
 }
 
 const clearBlacklistNotification = (cryptoCode, cryptoAddress) => {
   const sql = `UPDATE notifications SET valid = 'f', read = 't' WHERE type = 'compliance' AND detail->>'cryptoCode' = $1 AND detail->>'cryptoAddress' = $2 AND (detail->>'code' = 'BLOCKED' OR detail->>'code' = 'REUSED')`
-  return db.$none(sql, [cryptoCode, cryptoAddress]).catch(console.error)
+  return db.none(sql, [cryptoCode, cryptoAddress]).catch(console.error)
 }
 
 const getValidNotifications = (type, detail) => {
   const sql = `SELECT * FROM notifications WHERE type = $1 AND valid = 't' AND detail @> $2`
-  return db.$any(sql, [type, detail]).catch(console.error)
+  return db.any(sql, [type, detail]).catch(console.error)
 }
 
 const getNotifications = () => {
   const sql = `SELECT * FROM notifications ORDER BY created DESC`
-  return db.$any(sql).catch(console.error)
+  return db.any(sql).catch(console.error)
 }
 const setRead = (id, read) => {
   const sql = `UPDATE notifications SET read = $1 WHERE id = $2`
-  return db.$none(sql, [read, id]).catch(console.error)
+  return db.none(sql, [read, id]).catch(console.error)
 }
 
 const markAllAsRead = () => {
   const sql = `UPDATE notifications SET read = 't'`
-  return db.$none(sql).catch(console.error)
+  return db.none(sql).catch(console.error)
 }
 
 const hasUnreadNotifications = () => {
   const sql = `SELECT EXISTS (SELECT 1 FROM notifications WHERE read = 'f' LIMIT 1)`
-  return db.$oneOrNone(sql).then(res => res.exists).catch(console.error)
+  return db.oneOrNone(sql).then(res => res.exists).catch(console.error)
 }
 
 const getAlerts = () => {
   const types = ['fiatBalance', 'cryptoBalance', 'error']
   const sql = `SELECT * FROM notifications WHERE valid = 't' AND type IN ($1:list) ORDER BY created DESC`
-  return db.$any(sql, [types]).catch(console.error)
+  return db.any(sql, [types]).catch(console.error)
 }
 
 module.exports = {
diff --git a/lib/pairing.js b/lib/pairing.js
index 94bee997..5932878c 100644
--- a/lib/pairing.js
+++ b/lib/pairing.js
@@ -9,7 +9,7 @@ function pullToken (token) {
   const sql = `delete from pairing_tokens
     where token=$1
     returning name, created < now() - interval '1 hour' as expired`
-  return db.$one(sql, [token])
+  return db.one(sql, [token])
 }
 
 function unpair (deviceId) {
@@ -17,7 +17,7 @@ function unpair (deviceId) {
   const deleteMachinePings = 'delete from machine_pings where device_id=$1'
 
   // TODO new-admin: We should remove all configs related to that device. This can get tricky.
-  return Promise.all([db.$none(sql, [deviceId]), db.$none(deleteMachinePings, [deviceId])])
+  return Promise.all([db.none(sql, [deviceId]), db.none(deleteMachinePings, [deviceId])])
 }
 
 function pair (token, deviceId, machineModel) {
@@ -29,7 +29,7 @@ function pair (token, deviceId, machineModel) {
     on conflict (device_id)
     do update set paired=TRUE, display=TRUE`
 
-      return db.$none(insertSql, [deviceId, r.name])
+      return db.none(insertSql, [deviceId, r.name])
         .then(() => true)
     })
     .catch(err => {
@@ -51,7 +51,7 @@ function authorizeCaDownload (caToken) {
 function isPaired (deviceId) {
   const sql = 'select device_id, name from devices where device_id=$1 and paired=TRUE'
 
-  return db.$oneOrNone(sql, [deviceId])
+  return db.oneOrNone(sql, [deviceId])
     .then(row => row && row.device_id === deviceId ? row.name : false)
 }
 
diff --git a/lib/plugins.js b/lib/plugins.js
index c0b0ee85..985f7365 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -192,7 +192,7 @@ function plugins (settings, deviceId) {
   order by id desc
   limit 1`
 
-    return db.$one(sql, ['config'])
+    return db.one(sql, ['config'])
       .then(row => row.id)
   }
 
@@ -281,9 +281,9 @@ function plugins (settings, deviceId) {
     }
 
     return Promise.all([
-      db.$none(`insert into machine_pings(device_id, device_time) values($1, $2) 
+      db.none(`insert into machine_pings(device_id, device_time) values($1, $2) 
             ON CONFLICT (device_id) DO UPDATE SET device_time = $2, updated = now()`, [deviceId, deviceTime]),
-      db.$none(pgp.helpers.update(devices, null, 'devices') + 'WHERE device_id = ${deviceId}', {
+      db.none(pgp.helpers.update(devices, null, 'devices') + 'WHERE device_id = ${deviceId}', {
         deviceId
       })
     ])
@@ -364,7 +364,7 @@ function plugins (settings, deviceId) {
         const sql = 'update cash_out_txs set notified=$1 where id=$2'
         const values = [true, tx.id]
 
-        return db.$none(sql, values)
+        return db.none(sql, values)
       })
   }
 
@@ -379,7 +379,7 @@ function plugins (settings, deviceId) {
   }
 
   function pong () {
-    return db.$none(`UPDATE server_events SET created=now() WHERE event_type=$1;
+    return db.none(`UPDATE server_events SET created=now() WHERE event_type=$1;
        INSERT INTO server_events (event_type) SELECT $1
        WHERE NOT EXISTS (SELECT 1 FROM server_events WHERE event_type=$1);`, ['ping'])
       .catch(logger.error)
@@ -583,8 +583,8 @@ function plugins (settings, deviceId) {
     )
     const tradeEntry = massage(_tradeEntry, error)
     const sql = pgp.helpers.insert(tradeEntry, null, 'trades') + 'RETURNING *'
-    db.$tx(t => {
-      return t.$oneOrNone(sql)
+    db.tx(t => {
+      return t.oneOrNone(sql)
         .then(newTrade => recordTradeAndTx(newTrade.id, _tradeEntry, t))
     })
   }
@@ -735,7 +735,7 @@ function plugins (settings, deviceId) {
           const sql = `update cash_out_txs set swept='t'
       where id=$1`
 
-          return db.$none(sql, row.id)
+          return db.none(sql, row.id)
         }
       })
       .catch(err => logger.error('[%s] Sweep error: %s', cryptoCode, err.message))
@@ -745,7 +745,7 @@ function plugins (settings, deviceId) {
     const sql = `select id, crypto_code, hd_index from cash_out_txs
   where hd_index is not null and not swept and status in ('confirmed', 'instant')`
 
-    return db.$any(sql)
+    return db.any(sql)
       .then(rows => Promise.all(rows.map(sweepHdRow)))
       .catch(err => logger.error(err))
   }
diff --git a/lib/postgresql_interface.js b/lib/postgresql_interface.js
index fc4e8bdb..eb030e91 100644
--- a/lib/postgresql_interface.js
+++ b/lib/postgresql_interface.js
@@ -22,14 +22,14 @@ exports.recordDeviceEvent = function recordDeviceEvent (deviceId, event) {
   const values = [deviceId, event.eventType, event.note,
     event.deviceTime]
 
-  return db.$none(sql, values)
+  return db.none(sql, values)
 }
 
 exports.cassetteCounts = function cassetteCounts (deviceId) {
   const sql = 'SELECT cassette1, cassette2 FROM devices ' +
     'WHERE device_id=$1'
 
-  return db.$one(sql, [deviceId])
+  return db.one(sql, [deviceId])
     .then(row => {
       const counts = [row.cassette1, row.cassette2]
       return {counts}
@@ -46,14 +46,14 @@ exports.machineEvent = function machineEvent (rec) {
   const deleteSql = `delete from machine_events
   where created < now() - interval '1 days'`
 
-  return db.$none(sql, values)
-    .then(() => db.$none(deleteSql))
+  return db.none(sql, values)
+    .then(() => db.none(deleteSql))
 }
 
 exports.machineEventsByIdBatch = function machineEventsByIdBatch (machineIds) {
   const formattedIds = _.map(pgp.as.text, machineIds).join(',')
   const sql = `SELECT *, (EXTRACT(EPOCH FROM (now() - created))) * 1000 AS age FROM machine_events WHERE device_id IN ($1^) ORDER BY age ASC LIMIT 1`
-  return db.$any(sql, [formattedIds]).then(res => {
+  return db.any(sql, [formattedIds]).then(res => {
     const events = _.map(_.mapKeys(_.camelCase))(res)
     const eventMap = _.groupBy('deviceId', events)
     return machineIds.map(id => _.prop([0], eventMap[id]))
@@ -63,5 +63,5 @@ exports.machineEventsByIdBatch = function machineEventsByIdBatch (machineIds) {
 exports.machineEvents = function machineEvents () {
   const sql = 'SELECT *, (EXTRACT(EPOCH FROM (now() - created))) * 1000 AS age FROM machine_events'
 
-  return db.$any(sql, [])
+  return db.any(sql, [])
 }
diff --git a/lib/promo-codes.js b/lib/promo-codes.js
index be977ad0..9bc52d85 100644
--- a/lib/promo-codes.js
+++ b/lib/promo-codes.js
@@ -3,27 +3,27 @@ const uuid = require('uuid')
 
 function getAvailablePromoCodes () {
   const sql = `SELECT * FROM coupons WHERE soft_deleted=false`
-  return db.$any(sql)
+  return db.any(sql)
 }
 
 function getPromoCode (code) {
   const sql = `SELECT * FROM coupons WHERE code=$1 AND soft_deleted=false`
-  return db.$oneOrNone(sql, [code])
+  return db.oneOrNone(sql, [code])
 }
 
 function createPromoCode (code, discount) {
   const sql = `INSERT INTO coupons (id, code, discount) VALUES ($1, $2, $3) RETURNING *`
-  return db.$one(sql, [uuid.v4(), code, discount])
+  return db.one(sql, [uuid.v4(), code, discount])
 }
 
 function deletePromoCode (id) {
   const sql = `UPDATE coupons SET soft_deleted=true WHERE id=$1`
-  return db.$none(sql, [id])
+  return db.none(sql, [id])
 }
 
 function getNumberOfAvailablePromoCodes () {
   const sql = `SELECT COUNT(id) FROM coupons WHERE soft_deleted=false`
-  return db.$one(sql).then(res => res.count)
+  return db.one(sql).then(res => res.count)
 }
 
 module.exports = { getAvailablePromoCodes, getPromoCode, createPromoCode, deletePromoCode, getNumberOfAvailablePromoCodes }
diff --git a/lib/route-helpers.js b/lib/route-helpers.js
index a1791502..4fec0384 100644
--- a/lib/route-helpers.js
+++ b/lib/route-helpers.js
@@ -52,7 +52,7 @@ function fetchPhoneTx (phone) {
 
   const values = [phone, false, TRANSACTION_EXPIRATION]
 
-  return db.$any(sql, values)
+  return db.any(sql, values)
     .then(_.map(toCashOutTx))
     .then(txs => {
       const seenTxs = _.some(it => it.status !== 'notSeen', txs)
@@ -76,7 +76,7 @@ function fetchPhoneTx (phone) {
 function fetchStatusTx (txId, status) {
   const sql = 'select * from cash_out_txs where id=$1'
 
-  return db.$oneOrNone(sql, [txId])
+  return db.oneOrNone(sql, [txId])
     .then(toCashOutTx)
     .then(tx => {
       if (!tx) throw httpError('No transaction', 404)
@@ -86,7 +86,7 @@ function fetchStatusTx (txId, status) {
 }
 
 function updateDeviceConfigVersion (versionId) {
-  return db.$none('update devices set user_config_id=$1', [versionId])
+  return db.none('update devices set user_config_id=$1', [versionId])
 }
 
 module.exports = {
diff --git a/lib/routes.js b/lib/routes.js
index fd353137..d2c25a40 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -5,12 +5,13 @@ const helmet = require('helmet')
 const morgan = require('morgan')
 const nocache = require('nocache')
 
+const logger = require('./logger')
+const options = require('./options')
+
 const authorize = require('./middlewares/authorize')
 const errorHandler = require('./middlewares/errorHandler')
 const filterOldRequests = require('./middlewares/filterOldRequests')
-const computeSchema = require('./compute-schema')
-const logger = require('./logger')
-const options = require('./options')
+const computeSchema = require('./middlewares/compute-schema')
 const findOperatorId = require('./middlewares/operatorId')
 const populateDeviceId = require('./middlewares/populateDeviceId')
 const populateSettings = require('./middlewares/populateSettings')
diff --git a/lib/session-manager.js b/lib/session-manager.js
index 77bf4d1c..3785c576 100644
--- a/lib/session-manager.js
+++ b/lib/session-manager.js
@@ -2,7 +2,7 @@ const db = require('./db')
 
 function getSessions () {
   const sql = `SELECT * FROM user_sessions ORDER BY sess -> 'user' ->> 'username'`
-  return db.$any(sql)
+  return db.any(sql)
 }
 
 function getLastSessionPerUser () {
@@ -16,27 +16,27 @@ function getLastSessionPerUser () {
     SELECT DISTINCT ON (username)
     username, role
     FROM users) b ON a.username = b.username`
-  return db.$any(sql)
+  return db.any(sql)
 }
 
 function getSessionsByUsername (username) {
   const sql = `SELECT * FROM user_sessions WHERE sess -> 'user' ->> 'username'=$1`
-  return db.$any(sql, [username])
+  return db.any(sql, [username])
 }
 
 function getSessionById (sessionID) {
   const sql = `SELECT * FROM user_sessions WHERE sid=$1`
-  return db.$any(sql, [sessionID])
+  return db.any(sql, [sessionID])
 }
 
 function deleteSessionsByUsername (username) {
   const sql = `DELETE FROM user_sessions WHERE sess -> 'user' ->> 'username'=$1`
-  return db.$none(sql, [username])
+  return db.none(sql, [username])
 }
 
 function deleteSessionById (sessionID) {
   const sql = `DELETE FROM user_sessions WHERE sid=$1`
-  return db.$none(sql, [sessionID])
+  return db.none(sql, [sessionID])
 }
 
 module.exports = { getSessions, getLastSessionPerUser, getSessionsByUsername, getSessionById, deleteSessionsByUsername, deleteSessionById }
diff --git a/lib/token-manager.js b/lib/token-manager.js
deleted file mode 100644
index f98489c6..00000000
--- a/lib/token-manager.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const db = require('./db')
-
-function getTokenList () {
-  const sql = `select * from user_tokens`
-  return db.$any(sql)
-}
-
-function revokeToken (token) {
-  const sql = `delete from user_tokens where token = $1`
-  return db.$none(sql, [token])
-}
-
-module.exports = { getTokenList, revokeToken }
diff --git a/lib/tx.js b/lib/tx.js
index 928a584f..dd5283d7 100644
--- a/lib/tx.js
+++ b/lib/tx.js
@@ -78,7 +78,7 @@ function customerHistory (customerId, thresholdDays) {
     ORDER BY created;`
 
   const days = _.isNil(thresholdDays) ? 0 : thresholdDays
-  return db.$any(sql, [customerId, `${days} days`])
+  return db.any(sql, [customerId, `${days} days`])
 }
 
 module.exports = { post, cancel, customerHistory }
diff --git a/lib/users.js b/lib/users.js
index a8b027de..b11a0bf3 100644
--- a/lib/users.js
+++ b/lib/users.js
@@ -19,7 +19,7 @@ const db = require('./db')
  */
 function get (token) {
   const sql = 'SELECT * FROM user_tokens WHERE token=$1'
-  return db.$oneOrNone(sql, [token])
+  return db.oneOrNone(sql, [token])
 }
 
 /**
@@ -35,45 +35,45 @@ function get (token) {
 function getByIds (ids) {
   const sql = `SELECT * FROM users WHERE id IN ($1^)`
   const idList = _.map(pgp.as.text, ids).join(',')
-  return db.$any(sql, [idList])
+  return db.any(sql, [idList])
 }
 
 function getUserById (id) {
   const sql = `SELECT * FROM users WHERE id=$1`
-  return db.$oneOrNone(sql, [id])
+  return db.oneOrNone(sql, [id])
 }
 
 function getUserByUsername (username) {
   const sql = `SELECT * FROM users WHERE username=$1`
-  return db.$oneOrNone(sql, [username])
+  return db.oneOrNone(sql, [username])
 }
 
 function getUsers () {
   const sql = `SELECT id, username, role, enabled, last_accessed, last_accessed_from, last_accessed_address FROM users ORDER BY username`
-  return db.$any(sql)
+  return db.any(sql)
 }
 
 function verifyAndUpdateUser (id, ua, ip) {
   const sql = `SELECT id, username, role, enabled FROM users WHERE id=$1 limit 1`
-  return db.$oneOrNone(sql, [id])
+  return db.oneOrNone(sql, [id])
     .then(user => {
       if (!user) return null
 
       const sql2 = `UPDATE users SET last_accessed=now(), last_accessed_from=$1, last_accessed_address=$2 WHERE id=$3 RETURNING id, role, enabled`
-      return db.$one(sql2, [ua, ip, id])
+      return db.one(sql2, [ua, ip, id])
     })
     .then(user => user)
 }
 
 function saveTemp2FASecret (id, secret) {
   const sql = 'UPDATE users SET temp_twofa_code=$1 WHERE id=$2'
-  return db.$none(sql, [secret, id])
+  return db.none(sql, [secret, id])
 }
 
 function save2FASecret (id, secret) {
   return db.tx(t => {
-    const q1 = t.$none('UPDATE users SET twofa_code=$1, temp_twofa_code=NULL WHERE id=$2', [secret, id])
-    const q2 = t.$none(`DELETE FROM user_sessions WHERE sess -> 'user' ->> 'id'=$1`, [id])
+    const q1 = t.none('UPDATE users SET twofa_code=$1, temp_twofa_code=NULL WHERE id=$2', [secret, id])
+    const q2 = t.none(`DELETE FROM user_sessions WHERE sess -> 'user' ->> 'id'=$1`, [id])
     return t.batch([q1, q2])
   })
 }
@@ -82,7 +82,7 @@ function validateAuthToken (token, type) {
   const sql = `SELECT user_id, now() < expire AS success FROM auth_tokens
     WHERE token=$1 AND type=$2`
 
-  return db.$one(sql, [token, type])
+  return db.one(sql, [token, type])
     .then(res => ({ userID: res.user_id, success: res.success }))
 }
 
@@ -90,9 +90,9 @@ function reset2FASecret (token, id, secret) {
   return validateAuthToken(token, 'reset_twofa').then(res => {
     if (!res.success) throw new Error('Failed to verify 2FA reset token')
     return db.tx(t => {
-      const q1 = t.$none('UPDATE users SET twofa_code=$1, temp_twofa_code=NULL WHERE id=$2', [secret, id])
-      const q2 = t.$none(`DELETE FROM user_sessions WHERE sess -> 'user' ->> 'id'=$1`, [id])
-      const q3 = t.$none(`DELETE FROM auth_tokens WHERE token=$1 and type='reset_twofa'`, [token])
+      const q1 = t.none('UPDATE users SET twofa_code=$1, temp_twofa_code=NULL WHERE id=$2', [secret, id])
+      const q2 = t.none(`DELETE FROM user_sessions WHERE sess -> 'user' ->> 'id'=$1`, [id])
+      const q3 = t.none(`DELETE FROM auth_tokens WHERE token=$1 and type='reset_twofa'`, [token])
       return t.batch([q1, q2, q3])
     })
   })
@@ -103,9 +103,9 @@ function updatePassword (token, id, password) {
     if (!res.success) throw new Error('Failed to verify password reset token')
     return argon2.hash(password).then(function (hash) {
       return db.tx(t => {
-        const q1 = t.$none(`UPDATE users SET password=$1 WHERE id=$2`, [hash, id])
-        const q2 = t.$none(`DELETE FROM user_sessions WHERE sess -> 'user' ->> 'id'=$1`, [id])
-        const q3 = t.$none(`DELETE FROM auth_tokens WHERE token=$1 and type='reset_password'`, [token])
+        const q1 = t.none(`UPDATE users SET password=$1 WHERE id=$2`, [hash, id])
+        const q2 = t.none(`DELETE FROM user_sessions WHERE sess -> 'user' ->> 'id'=$1`, [id])
+        const q3 = t.none(`DELETE FROM auth_tokens WHERE token=$1 and type='reset_password'`, [token])
         return t.batch([q1, q2, q3])
       })
     })
@@ -117,13 +117,13 @@ function createUserRegistrationToken (username, role) {
   const sql = `INSERT INTO user_register_tokens (token, username, role) VALUES ($1, $2, $3) ON CONFLICT (username)
     DO UPDATE SET token=$1, expire=now() + interval '${constants.REGISTRATION_TOKEN_EXPIRATION_TIME}' RETURNING *`
 
-  return db.$one(sql, [token, username, role])
+  return db.one(sql, [token, username, role])
 }
 
 function validateUserRegistrationToken (token) {
   const sql = `SELECT username, role, now() < expire AS success FROM user_register_tokens WHERE token=$1`
 
-  return db.$one(sql, [token])
+  return db.one(sql, [token])
     .then(res => ({ username: res.username, role: res.role, success: res.success }))
 }
 
@@ -132,8 +132,8 @@ function register (token, username, password, role) {
     if (!res.success) throw new Error('Failed to verify registration token')
     return argon2.hash(password).then(hash => {
       return db.tx(t => {
-        const q1 = t.$none(`INSERT INTO users (id, username, password, role) VALUES ($1, $2, $3, $4)`, [uuid.v4(), username, hash, role])
-        const q2 = t.$none(`DELETE FROM user_register_tokens WHERE token=$1`, [token])
+        const q1 = t.none(`INSERT INTO users (id, username, password, role) VALUES ($1, $2, $3, $4)`, [uuid.v4(), username, hash, role])
+        const q2 = t.none(`DELETE FROM user_register_tokens WHERE token=$1`, [token])
         return t.batch([q1, q2])
       })
     })
@@ -142,18 +142,18 @@ function register (token, username, password, role) {
 
 function changeUserRole (id, newRole) {
   const sql = `UPDATE users SET role=$1 WHERE id=$2`
-  return db.$none(sql, [newRole, id])
+  return db.none(sql, [newRole, id])
 }
 
 function enableUser (id) {
   const sql = `UPDATE users SET enabled=true WHERE id=$1`
-  return db.$none(sql, [id])
+  return db.none(sql, [id])
 }
 
 function disableUser (id) {
   return db.tx(t => {
-    const q1 = t.$none(`UPDATE users SET enabled=false WHERE id=$1`, [id])
-    const q2 = t.$none(`DELETE FROM user_sessions WHERE sess -> 'user' ->> 'id'=$1`, [id])
+    const q1 = t.none(`UPDATE users SET enabled=false WHERE id=$1`, [id])
+    const q2 = t.none(`DELETE FROM user_sessions WHERE sess -> 'user' ->> 'id'=$1`, [id])
     return t.batch([q1, q2])
   })
 }
diff --git a/migrations/db.js b/migrations/db.js
index ec2e2ba3..ba480d8f 100644
--- a/migrations/db.js
+++ b/migrations/db.js
@@ -6,7 +6,7 @@ module.exports = { multi }
 function multi (sqls, cb) {
   const doQuery = s => {
     return () => {
-      return db.$none(s)
+      return db.none(s)
         .catch(err => {
           console.log(err.stack)
           throw err
diff --git a/package-lock.json b/package-lock.json
index 2aed2058..c83589b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5281,6 +5281,11 @@
         }
       }
     },
+    "assert-options": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz",
+      "integrity": "sha512-7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ=="
+    },
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
@@ -6957,9 +6962,9 @@
       "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo="
     },
     "buffer-writer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz",
-      "integrity": "sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
+      "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="
     },
     "buffer-xor": {
       "version": "1.0.3",
@@ -14890,11 +14895,6 @@
         "tmpl": "1.0.x"
       }
     },
-    "manakin": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/manakin/-/manakin-0.5.2.tgz",
-      "integrity": "sha512-pfDSB7QYoVg0Io4KMV9hhPoXpj6p0uBscgtyUSKCOFZe8bqgbpStfgnKIbF/ulnr6U3ICu4OqdyxAqBgOhZwBQ=="
-    },
     "map-age-cleaner": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -16500,9 +16500,9 @@
       }
     },
     "packet-reader": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.3.1.tgz",
-      "integrity": "sha1-zWLmCvjX/qinBexP+ZCHHEaHHyc="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
+      "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
     },
     "pandemonium": {
       "version": "1.5.0",
@@ -16690,20 +16690,21 @@
       },
       "dependencies": {
         "pg-types": {
-          "version": "1.12.1",
-          "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.12.1.tgz",
-          "integrity": "sha1-1kCH45A7WP+q0nnnWVxSIIoUw9I=",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+          "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
           "requires": {
-            "postgres-array": "~1.0.0",
+            "pg-int8": "1.0.1",
+            "postgres-array": "~2.0.0",
             "postgres-bytea": "~1.0.0",
-            "postgres-date": "~1.0.0",
+            "postgres-date": "~1.0.4",
             "postgres-interval": "^1.1.0"
           }
         },
-        "semver": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
-          "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c="
+        "postgres-array": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+          "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="
         }
       }
     },
@@ -16718,9 +16719,9 @@
       "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
     },
     "pg-minify": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/pg-minify/-/pg-minify-0.5.5.tgz",
-      "integrity": "sha512-7Pf9h6nV1RFqED1hkRosePqvpPwNUUtW06TT4+lHwzesxa5gffxkShTjYH6JXV5sSSfh5+2yHOTTWEkCyCQ0Eg=="
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz",
+      "integrity": "sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="
     },
     "pg-native": {
       "version": "3.0.0",
@@ -19402,9 +19403,9 @@
       "dev": true
     },
     "spex": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/spex/-/spex-2.0.2.tgz",
-      "integrity": "sha512-LU6TS3qTEpRth+FnNs/fIWEmridYN7JmaN2k1Jk31XVC4ex7+wYxiHMnKguRxS7oKjbOFl4H6seeWNDFFgkVRg=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz",
+      "integrity": "sha512-9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg=="
     },
     "split": {
       "version": "1.0.1",
diff --git a/tools/show.js b/tools/show.js
index 7ba63237..876d27e1 100644
--- a/tools/show.js
+++ b/tools/show.js
@@ -7,7 +7,7 @@ function pp (o) {
 }
 
 function dbFetchConfig () {
-  return db.$oneOrNone(
+  return db.oneOrNone(
     'select data from user_config where type=$1 order by id desc limit 1',
     ['config']
   )