diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchPostExecute.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchPostExecute.java
index 776b7e8fd..b91b56fc7 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchPostExecute.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchPostExecute.java
@@ -1,7 +1,5 @@
 package com.avaje.ebeaninternal.server.persist;
 
-import java.sql.SQLException;
-
 /**
  * Handles the processing required after batch execution.
  * <p>
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java
index 64bb41952..41f1d5d36 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java
@@ -7,8 +7,6 @@ import java.util.ArrayList;
  */
 public class BindValues {
 
-    int commentCount;
-
     final ArrayList<Value> list = new ArrayList<Value>();
     
     /**
@@ -21,7 +19,7 @@ public class BindValues {
      * Return the number of bind values.
      */
     public int size() {
-        return list.size() - commentCount;
+        return list.size();
     }
     
     /**
@@ -34,11 +32,6 @@ public class BindValues {
         list.add(new Value(value, dbType, name));
     }
     
-    public void addComment(String comment){
-    	++commentCount;
-        list.add(new Value(comment));
-    }
-    
     /**
      * List of bind values.
      */
@@ -56,38 +49,16 @@ public class BindValues {
         private final int dbType;
                
         private final String name;
-
-        private final boolean isComment;
-        
-        /**
-         * Create a comment. This is so that comments can be put into
-         * the bind log.
-         */
-        public Value(String comment) {
-            this.name = comment;
-            this.isComment = true;
-            value = null;
-            dbType = 0;
-        }
-        
         
         /**
          * Create the value.
          */
         public Value(Object value, int dbType, String name) {
-        	this.isComment = false;
             this.value = value;
             this.dbType = dbType;
             this.name = name;
         }
-        
-        /**
-         * This is a comment for the bind log and NOT an actual bind value.
-         */
-        public boolean isComment() {
-        	return isComment;
-        }
-        
+
         /**
          * Return the type as per java.sql.Types.
          */
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java
index d02b51724..d88c5cd88 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java
@@ -43,30 +43,22 @@ public class Binder {
     ArrayList<BindValues.Value> list = bindValues.values();
     for (int i = 0; i < list.size(); i++) {
       BindValues.Value bindValue = list.get(i);
-      if (bindValue.isComment()) {
-        if (bindBuf != null) {
-          bindBuf.append(bindValue.getName());
-          if (logPrefix.equals("")) {
-            logPrefix = ", ";
-          }
-        }
-      } else {
-        Object val = bindValue.getValue();
-        int dt = bindValue.getDbType();
-        bindObject(dataBind, val, dt);
 
-        if (bindBuf != null) {
-          bindBuf.append(logPrefix);
-          if (logPrefix.equals("")) {
-            logPrefix = ", ";
-          }
-          bindBuf.append(bindValue.getName());
-          bindBuf.append("=");
-          if (isLob(dt)) {
-            bindBuf.append("[LOB]");
-          } else {
-            bindBuf.append(String.valueOf(val));
-          }
+      Object val = bindValue.getValue();
+      int dt = bindValue.getDbType();
+      bindObject(dataBind, val, dt);
+
+      if (bindBuf != null) {
+        bindBuf.append(logPrefix);
+        if (logPrefix.equals("")) {
+          logPrefix = ", ";
+        }
+        bindBuf.append(bindValue.getName());
+        bindBuf.append("=");
+        if (isLob(dt)) {
+          bindBuf.append("[LOB]");
+        } else {
+          bindBuf.append(String.valueOf(val));
         }
       }
     }