diff --git a/lib/transport/messages.js b/lib/transport/messages.js
index dbb3f1236..8a55a8d07 100644
--- a/lib/transport/messages.js
+++ b/lib/transport/messages.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var Buffers = require('buffers');
-var buffertools = require('buffertools');
 var Put = require('bufferput');
 var util = require('util');
 
@@ -43,7 +42,7 @@ var parseMessage = function(network, dataBuffer) {
   var checksum = dataBuffer.slice(20, 24);
 
   var checksumConfirm = Hash.sha256sha256(payload).slice(0, 4);
-  if (buffertools.compare(checksumConfirm, checksum) !== 0) {
+  if (!BufferUtil.equals(checksumConfirm, checksum)) {
     dataBuffer.skip(messageLength);
     return;
   }
@@ -67,7 +66,7 @@ function discardUntilNextMessage(network, dataBuffer) {
   for (;;) {
     // check if it's the beginning of a new message
     var packageNumber = dataBuffer.slice(0, 4);
-    if (buffertools.compare(packageNumber, magicNumber) == 0) {
+    if (BufferUtil.equals(packageNumber, magicNumber)) {
       dataBuffer.skip(i);
       return true;
     }
diff --git a/lib/util/buffer.js b/lib/util/buffer.js
index deb9f3ab7..f7de3cd29 100644
--- a/lib/util/buffer.js
+++ b/lib/util/buffer.js
@@ -2,7 +2,6 @@
 
 var buffer = require('buffer');
 var assert = require('assert');
-var buffertools = require('buffertools');
 
 var js = require('./js');
 
@@ -20,8 +19,20 @@ function equals(a, b) {
 }
 
 module.exports = {
-  NULL_HASH: buffertools.fill(new Buffer(32), 0),
-  EMPTY_BUFFER: new Buffer(0),
+  /**
+   * Fill a buffer with a value.
+   *
+   * @param {Buffer} buffer
+   * @param {number} value
+   * @return {Buffer}
+   */
+  fill: function fill(buffer, value) {
+    var length = buffer.length;
+    for (var i = 0; i < length; i++) {
+      buffer[i] = value;
+    }
+    return buffer;
+  },
 
   /**
    * Returns true if the given argument is an instance of a buffer. Tests for
@@ -140,3 +151,6 @@ module.exports = {
     return new buffer.Buffer(string, 'hex');
   }
 };
+
+module.exports.NULL_HASH = module.exports.fill(new Buffer(32), 0);
+module.exports.EMPTY_BUFFER = new Buffer(0);