diff --git a/src/main/java/net/spy/memcached/MemcachedNode.java b/src/main/java/net/spy/memcached/MemcachedNode.java
index fb1235c2f..5fa5ba672 100644
--- a/src/main/java/net/spy/memcached/MemcachedNode.java
+++ b/src/main/java/net/spy/memcached/MemcachedNode.java
@@ -72,11 +72,6 @@ public interface MemcachedNode {
    */
   void fillWriteBuffer(boolean optimizeGets);
 
-  /**
-   * Transition the current write item into a read state.
-   */
-  void transitionWriteItem();
-
   /**
    * Get the operation at the top of the queue that is requiring input.
    */
diff --git a/src/main/java/net/spy/memcached/MemcachedNodeROImpl.java b/src/main/java/net/spy/memcached/MemcachedNodeROImpl.java
index b162bd951..dfe0640e2 100644
--- a/src/main/java/net/spy/memcached/MemcachedNodeROImpl.java
+++ b/src/main/java/net/spy/memcached/MemcachedNodeROImpl.java
@@ -177,10 +177,6 @@ public void setupResend(String cause) {
     throw new UnsupportedOperationException();
   }
 
-  public void transitionWriteItem() {
-    throw new UnsupportedOperationException();
-  }
-
   public int writeSome() throws IOException {
     throw new UnsupportedOperationException();
   }
diff --git a/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java b/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java
index b8e4bc83e..6d23f0612 100644
--- a/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java
+++ b/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java
@@ -78,7 +78,7 @@ public abstract class TCPMemcachedNodeImpl extends SpyObject
   private final AtomicLong timeoutStartNanos = new AtomicLong(0);
   private boolean toRatioEnabled = false;
   private int[] toCountArray;
-  private final static int MAX_TOCOUNT = 100;   /* to count array size */
+  private static final int MAX_TOCOUNT = 100;   /* to count array size */
   private int toCountIdx;         /* to count array index */
   private int toRatioMax;         /* maximum timeout ratio */
   private int toRatioNow;         /* current timeout ratio */
@@ -260,9 +260,11 @@ public final void fillWriteBuffer(boolean shouldOptimize) {
         getWbuf().put(b);
         getLogger().debug("After copying stuff from %s: %s",
                 o, getWbuf());
-        if (!o.getBuffer().hasRemaining()) {
+        if (!obuf.hasRemaining()) {
           o.writeComplete();
-          transitionWriteItem();
+
+          Operation op = removeCurrentWriteOp();
+          getLogger().debug("Finished writing %s", op);
 
           preparePending();
           if (shouldOptimize) {
@@ -288,12 +290,6 @@ public final void fillWriteBuffer(boolean shouldOptimize) {
     }
   }
 
-  public final void transitionWriteItem() {
-    Operation op = removeCurrentWriteOp();
-    assert op != null : "There is no write item to transition";
-    getLogger().debug("Finished writing %s", op);
-  }
-
   protected abstract void optimize();
 
   public final Operation getCurrentReadOp() {
diff --git a/src/test/java/net/spy/memcached/MockMemcachedNode.java b/src/test/java/net/spy/memcached/MockMemcachedNode.java
index 5f354764a..120447960 100644
--- a/src/test/java/net/spy/memcached/MockMemcachedNode.java
+++ b/src/test/java/net/spy/memcached/MockMemcachedNode.java
@@ -75,10 +75,6 @@ public void fillWriteBuffer(boolean optimizeGets) {
     // noop
   }
 
-  public void transitionWriteItem() {
-    // noop
-  }
-
   public Operation getCurrentReadOp() {
     return null;
   }