diff --git a/lib/services/address/index.js b/lib/services/address/index.js
index 1084fd1a..1339d672 100644
--- a/lib/services/address/index.js
+++ b/lib/services/address/index.js
@@ -509,7 +509,7 @@ AddressService.prototype._processOutput = function(tx, output, index, opts) {
   var utxoKey = this._encoding.encodeUtxoIndexKey(address, txid, index);
   var utxoValue = this._encoding.encodeUtxoIndexValue(
     opts.block.height,
-    Unit.fromBTC(output.value).toSatoshis(),
+    output.value,
     timestamp,
     output.script.toRaw()
   );
diff --git a/lib/services/p2p/testp2p.js b/lib/services/p2p/testp2p.js
deleted file mode 100644
index 61565b6c..00000000
--- a/lib/services/p2p/testp2p.js
+++ /dev/null
@@ -1,40 +0,0 @@
-'use strict';
-
-var p2p = require('bitcore-p2p');
-var messages = new p2p.Messages();
-var opts = {};
-opts.addrs = [ { ip: { v4: '192.168.3.5' } } ];
-opts.dnsSeed = false;
-opts.maxPeers = 1;
-opts.network = 'livenet';
-var pool = new p2p.Pool(opts);
-
-pool.on('peerready', function(peer, addr) {
-  console.log('Connected to peer: ' + addr.ip.v4);
-  peer.sendMessage(messages.MemPool());
-});
-
-pool.on('peerdisconnect', function(peer, addr) {
-  console.log('Disconnected from peer: ' + addr.ip.v4);
-});
-
-pool.on('peerinv', function(peer, message) {
-  var invList = [];
-  message.inventory.forEach(function(inv) {
-    invList.push(inv);
-  });
-  peer.sendMessage(messages.GetData(invList));
-});
-
-// pool.on('peertx', function(peer, message) {
-//   var tx = new bitcore.Transaction(message.transaction);
-//   if (self.validTx(tx)) {
-//     return self._cache.set(tx.id, tx);
-//   }
-//   return self._operations.push({
-//     type: 'put',
-//     key: new Buffer(tx.id),
-//     value: tx.toBuffer()
-//   });
-// });
-