diff --git a/lib/messages/builder.js b/lib/messages/builder.js
index 860dad89..3ef6e4be 100644
--- a/lib/messages/builder.js
+++ b/lib/messages/builder.js
@@ -9,7 +9,6 @@ var BN = bitcore.crypto.BN;
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;
 var BufferUtil = bitcore.util.buffer;
-var Put = require('bufferput'); //todo remove
 var $ = bitcore.util.preconditions;
 var _ = bitcore.deps._;
 
@@ -437,18 +436,14 @@ function builder(options) {
   };
 
   commands.headers.prototype.getPayload = function() {
-    var put = new Put();
-    put.varint(this.headers.length);
-
+    var bw = new BufferWriter();
+    bw.writeVarintNum(this.headers.length);
     for (var i = 0; i < this.headers.length; i++) {
-      var buffer = this
-        .headers[i]
-        .toBuffer();
-      put.put(buffer);
-      put.varint(0);
+      var buffer = this.headers[i].toBuffer();
+      bw.write(buffer);
+      bw.writeUInt8(0);
     }
-
-    return put.buffer();
+    return bw.concat();
   };
 
   /* notfound */
@@ -601,14 +596,14 @@ function builder(options) {
   };
 
   commands.alert.prototype.getPayload = function() {
-    var put = new Put();
-    put.varint(this.payload.length);
-    put.put(this.payload);
+    var bw = new BufferWriter();
+    bw.writeVarintNum(this.payload.length);
+    bw.write(this.payload);
 
-    put.varint(this.signature.length);
-    put.put(this.signature);
+    bw.writeVarintNum(this.signature.length);
+    bw.write(this.signature);
 
-    return put.buffer();
+    return bw.concat();
   };
 
   /* reject */
@@ -849,17 +844,17 @@ function builder(options) {
   };
 
   commands.getheaders.prototype.getPayload = function() {
-    var put = new Put();
-    put.word32le(this.version);
-    put.varint(this.starts.length);
+    var bw = new BufferWriter();
+    bw.writeUInt32LE(this.version);
+    bw.writeVarintNum(this.starts.length);
     for (var i = 0; i < this.starts.length; i++) {
-      put.put(this.starts[i]);
+      bw.write(this.starts[i]);
     }
     if (this.stop.length !== 32) {
       throw new Error('Invalid hash length: ' + this.stop.length);
     }
-    put.put(this.stop);
-    return put.buffer();
+    bw.write(this.stop);
+    return bw.concat();
   };
 
   /* mempool */
diff --git a/package.json b/package.json
index 5aedb1b9..164ce337 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,6 @@
   "dependencies": {
     "bitcore": "^0.11.0",
     "bloom-filter": "^0.1.1",
-    "bufferput": "^0.1.2",
     "buffers": "^0.1.1",
     "socks5-client": "^0.3.6"
   },