diff --git a/lib/plugins.js b/lib/plugins.js
index 0867c43c..c0f00e04 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -121,7 +121,7 @@ function loadOrConfigPlugin(pluginHandle, pluginType, currency,
       pluginHandle = loadPlugin(currentName, pluginConfig);
       currentlyUsedPlugins[pluginType] = currentName
       logger.debug('plugin(%s) loaded: %s', pluginType, pluginHandle.NAME ||
-        currentName);        
+        currentName);
     }
   }
 
@@ -286,7 +286,7 @@ function reapTxs() {
 }
 
 // TODO: Run these in parallel and return success
-exports.trade = function trade(session, rawTrade, cb) {
+exports.trade = function trade (session, rawTrade, cb) {
 
   // TODO: move this to DB, too
   // add bill to trader queue (if trader is enabled)
@@ -294,28 +294,12 @@ exports.trade = function trade(session, rawTrade, cb) {
     tradesQueue.push({
       currency: rawTrade.currency,
       satoshis: rawTrade.satoshis
-    });
+    })
   }
 
-  if (!rawTrade.toAddress) {
-    var newRawTrade = _.cloneDeep(rawTrade);
-    newRawTrade.toAddress = 'remit';
-    return db.recordBill(session, newRawTrade, cb);
-  }
-
-  var tx = {
-    txId: rawTrade.txId,
-    fiat: 0,
-    satoshis: 0,
-    toAddress: rawTrade.toAddress,
-    currencyCode: rawTrade.currency
-  };
-
-  async.parallel([
-    async.apply(db.addOutgoingPending, session, tx.currencyCode, tx.toAddress),
-    async.apply(db.recordBill, session, rawTrade)
-  ], cb);
-};
+  if (!rawTrade.toAddress) rawTrade.toAddress = 'remit'
+  return db.recordBill(session, rawTrade, cb)
+}
 
 exports.sendBitcoins = function sendBitcoins(session, rawTx, cb) {
   executeTx(session, rawTx, 'machine', cb);