diff --git a/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java b/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java
index 8409794de..15902f7c8 100644
--- a/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java
+++ b/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java
@@ -80,17 +80,16 @@ final class DRawSqlColumnsParser {
     return new ColumnMapping.Column(indexPos++, sb.toString(), split[split.length - 1]);
   }
 
-  private int nextComma() {
+  private void nextComma() {
     boolean inQuote = false;
     while (pos < end) {
       char c = sqlSelect.charAt(pos);
       if (c == '\'') {
         inQuote = !inQuote;
       } else if (!inQuote && c == ',') {
-        return pos;
+        return;
       }
       pos++;
     }
-    return pos;
   }
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilder.java b/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilder.java
index 2d05b685a..5a6e0f49e 100644
--- a/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilder.java
+++ b/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilder.java
@@ -54,17 +54,15 @@ public class HashQueryPlanBuilder {
   /**
    * Add a number to the bind count for the hash.
    */
-  public HashQueryPlanBuilder bind(int extraBindCount) {
+  public void bind(int extraBindCount) {
     bindCount += extraBindCount;
-    return this;
   }
 
   /**
    * Add raw sql to the hash.
    */
-  public HashQueryPlanBuilder addRawSql(String rawSql) {
+  public void addRawSql(String rawSql) {
     this.rawSql = rawSql;
-    return this;
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java b/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java
index d8346960d..6b197b892 100644
--- a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java
+++ b/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java
@@ -243,8 +243,8 @@ public class ScopedTransaction implements SpiTransaction {
   }
 
   @Override
-  public int depth(int diff) {
-    return transaction.depth();
+  public void depth(int diff) {
+    transaction.depth();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java b/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java
index dd7eba38c..6d023cd06 100644
--- a/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java
+++ b/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java
@@ -586,7 +586,7 @@ public interface SpiQuery<T> extends Query<T> {
    * <p>
    * This does not exclude/remove the use of the id property.
    */
-  Query<T> setSqlDistinct(boolean sqlDistinct);
+  void setSqlDistinct(boolean sqlDistinct);
 
   /**
    * Return true if this query has been specified by a user or internally by Ebean to use DISTINCT.
diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java b/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java
index 670d53a8e..8cdb889a2 100644
--- a/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java
+++ b/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java
@@ -125,7 +125,7 @@ public interface SpiTransaction extends Transaction {
    * executed first during save.
    * </p>
    */
-  int depth(int diff);
+  void depth(int diff);
 
   /**
    * Return the current depth.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/SocketClient.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/SocketClient.java
index db5b47aa8..27c43a9cd 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/SocketClient.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/SocketClient.java
@@ -114,16 +114,11 @@ class SocketClient {
         }
     }
     
-    public boolean send(SocketClusterMessage msg) throws IOException {
+    public void send(SocketClusterMessage msg) throws IOException {
 
         if (online){
             writeObject(msg);
-            return true;
-            
-        } else {
-            return false;
         }
-        
     }
     
     private void writeObject(Object object) throws IOException {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultSqlUpdate.java
index dd8b96edb..98357e1bc 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -196,10 +196,10 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
 		this.timeout = secs;
 		return this;
 	}
-    
-	public SqlUpdate addParameter(Object value) {
-        return setParameter(++addPos, value);
-    }
+
+  public void addParameter(Object value) {
+    setParameter(++addPos, value);
+  }
     
 	public SqlUpdate setParameter(int position, Object value) {
 		bindParams.setParameter(position, value);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
index e025bf427..f4513701e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
@@ -258,23 +258,22 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     beanPersistMap.add(beanDescriptor, type, idValue);
   }
 
-  public boolean notifyLocalPersistListener() {
-    if (beanPersistListener == null) {
-      return false;
-
-    } else {
+  public void notifyLocalPersistListener() {
+    if (beanPersistListener != null) {
       switch (type) {
-      case INSERT:
-        return beanPersistListener.inserted(bean);
+        case INSERT:
+          beanPersistListener.inserted(bean);
+          break;
 
-      case UPDATE:
-        return beanPersistListener.updated(bean, updatedProperties);
+        case UPDATE:
+          beanPersistListener.updated(bean, updatedProperties);
+          break;
 
-      case DELETE:
-        return beanPersistListener.deleted(bean);
+        case DELETE:
+          beanPersistListener.deleted(bean);
+          break;
 
-      default:
-        return false;
+        default:
       }
     }
   }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java
index 838b22f9e..75bb32716 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java
@@ -215,17 +215,16 @@ public final class DRawSqlSelectColumnsParser {
     return columnLabel.equalsIgnoreCase(prop.getDbColumn()) || columnLabel.equalsIgnoreCase(prop.getName());
   }
 
-	private int nextComma() {
+	private void nextComma() {
 		boolean inQuote = false;
 		while (pos < end) {
 			char c = sqlSelect.charAt(pos);
 			if (c == '\'') {
 				inQuote = !inQuote;
 			} else if (!inQuote && c == ',') {
-				return pos;
+				return;
 			}
 			pos++;
 		}
-		return pos;
 	}
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java
index a5fea21d0..341047380 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java
@@ -103,7 +103,7 @@ public class DeployOrmXml {
 		return ormXmlList;
 	}
 
-	private boolean readOrmXml(String ormXmlName, ArrayList<Dnode> ormXmlList) {
+	private void readOrmXml(String ormXmlName, ArrayList<Dnode> ormXmlList) {
 
 		try {
 			Dnode ormXml = null;
@@ -120,14 +120,10 @@ public class DeployOrmXml {
 			if (ormXml != null) {
 				ormXml.setAttribute("ebean.filename", ormXmlName);
 				ormXmlList.add(ormXml);
-				return true;
-
-			} else {
-				return false;
 			}
+
 		} catch (IOException e) {
 			logger.error("error reading orm xml deployment " + ormXmlName, e);
-			return false;
 		}
 	}
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java
index b691cc14f..7c325d11a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java
@@ -183,12 +183,12 @@ public class DeployTableJoin {
     return copyInternal(inverse, true, tableName, true);
   }
 
-  public DeployTableJoin copyTo(DeployTableJoin destJoin, boolean reverse, String tableName) {
-    return copyInternal(destJoin, reverse, tableName, true);
+  public void copyTo(DeployTableJoin destJoin, boolean reverse, String tableName) {
+    copyInternal(destJoin, reverse, tableName, true);
   }
 
-  public DeployTableJoin copyWithoutType(DeployTableJoin destJoin, boolean reverse, String tableName) {
-    return copyInternal(destJoin, reverse, tableName, false);
+  public void copyWithoutType(DeployTableJoin destJoin, boolean reverse, String tableName) {
+    copyInternal(destJoin, reverse, tableName, false);
   }
 
   private DeployTableJoin copyInternal(DeployTableJoin destJoin, boolean reverse, String tableName, boolean withType) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java
index eb16e18b8..8db8c4866 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java
@@ -78,7 +78,7 @@ public class DeployInherit {
 		}
 	}
 
-	private InheritInfo createFinalInfo(InheritInfo root, InheritInfo parent, DeployInheritInfo deploy) {
+	private void createFinalInfo(InheritInfo root, InheritInfo parent, DeployInheritInfo deploy) {
 
 		InheritInfo node = new InheritInfo(root, parent, deploy);
 		if (parent != null) {
@@ -94,8 +94,6 @@ public class DeployInherit {
 		for (DeployInheritInfo childDeploy : deploy.children()) {
 			createFinalInfo(root, node, childDeploy);
 		}
-
-		return node;
 	}
 
 	/**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployUtil.java
index 506563de1..92b84e4bb 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -103,7 +103,7 @@ public class DeployUtil {
     return new DataEncryptSupport(encryptKeyManager, bytesEncryptor, table, column);
   }
 
-  public ScalarType<?> setEnumScalarType(Enumerated enumerated, DeployBeanProperty prop) {
+  public void setEnumScalarType(Enumerated enumerated, DeployBeanProperty prop) {
 
     Class<?> enumType = prop.getPropertyType();
     if (!enumType.isEnum()) {
@@ -123,7 +123,6 @@ public class DeployUtil {
     }
     prop.setScalarType(scalarType);
     prop.setDbType(scalarType.getJdbcType());
-    return scalarType;
   }
 
   private ScalarType<?> createEnumScalarTypePerSpec(Class<?> enumType, EnumType type, int dbType) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
index e40175931..c92035260 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
@@ -17,7 +17,7 @@ public class FactoryAssocOnes {
 	/**
 	 * Add foreign key columns from associated one beans.
 	 */
-	public List<Bindable> create(List<Bindable> list, BeanDescriptor<?> desc, DmlMode mode) {
+	public void create(List<Bindable> list, BeanDescriptor<?> desc, DmlMode mode) {
 
 		BeanPropertyAssocOne<?>[] ones = desc.propertiesOneImported();
 
@@ -41,7 +41,5 @@ public class FactoryAssocOnes {
 				list.add(new BindableAssocOne(ones[i]));
 			}
 		}
-
-		return list;
 	}
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java
index 92805a673..01653379a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java
@@ -114,11 +114,10 @@ public class SqlTreeAlias {
     return alias;
   }
 
-  private String calcAliasManyWhere(String prefix) {
+  private void calcAliasManyWhere(String prefix) {
 
     String alias = nextManyWhereTableAlias();
     manyWhereAliasMap.put(prefix, alias);
-    return alias;
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index ee41cba03..a45a84345 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -888,15 +888,13 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return this;
   }
 
-  public DefaultOrmQuery<T> setQuery(String queryString) throws PersistenceException {
+  public void setQuery(String queryString) throws PersistenceException {
 
     this.query = queryString;
 
     OrmQueryDetailParser parser = new OrmQueryDetailParser(queryString);
     parser.parse();
     parser.assign(this);
-
-    return this;
   }
 
   protected void setOrmQueryDetail(OrmQueryDetail detail) {
@@ -1111,9 +1109,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   /**
    * Internally set to use SQL DISTINCT on the query but still have id property included.
    */
-  public DefaultOrmQuery<T> setSqlDistinct(boolean sqlDistinct) {
+  public void setSqlDistinct(boolean sqlDistinct) {
     this.sqlDistinct = sqlDistinct;
-    return this;
   }
 
   public Class<T> getBeanType() {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 49add2bf9..e5d17ce8e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -258,12 +258,11 @@ public class OrmQueryDetail implements Serializable {
    * @param partialProps
    *          the properties on the join property to include
    */
-  public OrmQueryProperties addFetch(String path, String partialProps, FetchConfig fetchConfig) {
+  public void addFetch(String path, String partialProps, FetchConfig fetchConfig) {
 
     OrmQueryProperties chunk = getChunk(path, true);
     chunk.setProperties(partialProps);
     chunk.setFetchConfig(fetchConfig);
-    return chunk;
   }
 
   public void sortFetchPaths(BeanDescriptor<?> d) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java
index 21509ae86..6b084f9c8 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -443,10 +443,9 @@ public class OrmQueryProperties implements Serializable {
     return included == null || included.contains(propName);
   }
 
-  public OrmQueryProperties setQueryFetch(int batch, boolean queryFetchAll) {
+  public void setQueryFetch(int batch, boolean queryFetchAll) {
     this.queryFetchBatch = batch;
     this.queryFetchAll = queryFetchAll;
-    return this;
   }
 
   public boolean isFetchJoin() {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java
index 1112084ed..74345a3f6 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java
@@ -194,8 +194,8 @@ public final class DefaultPersistenceContext implements PersistenceContext {
       map.clear();
     }
 
-    private Object remove(Object id) {
-      return map.remove(id);
+    private void remove(Object id) {
+      map.remove(id);
     }
 
     private void deleted(Object id) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java
index ae2e182f0..dc2fd1fc6 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -352,9 +352,8 @@ public class JdbcTransaction implements SpiTransaction {
    * @return the current depth plus the diff
    */
   @Override
-  public int depth(int diff) {
+  public void depth(int diff) {
     depth += diff;
-    return depth;
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java b/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java
index 635516673..d2c394015 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java
@@ -15,9 +15,8 @@ public class EnumToDbIntegerMap extends EnumToDbValueMap<Integer> {
     return Types.INTEGER;
   }
 
-  public EnumToDbIntegerMap add(Object beanValue, Integer dbValue) {
+  public void add(Object beanValue, Integer dbValue) {
     addInternal(beanValue, dbValue);
-    return this;
   }
 
   @Override