diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java b/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java
index e31af8074..1a5071fcc 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java
@@ -14,7 +14,6 @@ import static com.mysema.util.Symbols.NEW;
 import static com.mysema.util.Symbols.QUOTE;
 import static com.mysema.util.Symbols.RETURN;
 import static com.mysema.util.Symbols.SEMICOLON;
-import static com.mysema.util.Symbols.SERIAL;
 import static com.mysema.util.Symbols.SPACE;
 import static com.mysema.util.Symbols.STAR;
 import static com.mysema.util.Symbols.SUPER;
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/PCollection.java b/querydsl-core/src/main/java/com/mysema/query/types/path/PCollection.java
index 609ceaa3e..98c2a7f65 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/PCollection.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/path/PCollection.java
@@ -12,7 +12,6 @@ import com.mysema.commons.lang.Assert;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.ECollectionBase;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * PCollection represents collection paths
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/PSet.java b/querydsl-core/src/main/java/com/mysema/query/types/path/PSet.java
index 944511a5d..727ad45c9 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/PSet.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/path/PSet.java
@@ -12,7 +12,6 @@ import com.mysema.commons.lang.Assert;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.ECollectionBase;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * PSet represents set paths
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java
index bad44acd4..18fbd68e9 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java
@@ -8,7 +8,6 @@ package com.mysema.query.types.query;
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * Single result subquery
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java
index 15dfaf0cd..2651eaa12 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java
@@ -9,7 +9,6 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.EComparable;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * Single result subquery
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java
index 0134c7b2b..10704b4d4 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java
@@ -9,7 +9,6 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.EDate;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * Single result subquery
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java
index d595ceff3..31875abdd 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java
@@ -9,7 +9,6 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.EDateTime;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * Single result subquery
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/ListSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/ListSubQuery.java
index 2dd9bbd26..eed56b07c 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/ListSubQuery.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/query/ListSubQuery.java
@@ -11,7 +11,6 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.ECollectionBase;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * List result subquery
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java
index f72f2975e..b4f8e98ec 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java
@@ -9,7 +9,6 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.ENumber;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * Single result subquery
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java
index 4f4579e76..fdc53c5dc 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java
@@ -9,7 +9,6 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.EString;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * Single result subquery
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java
index 7d81891a8..efb76dc43 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java
@@ -9,7 +9,6 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.Visitor;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.ETime;
-import com.mysema.query.types.expr.Expr;
 
 /**
  * Single result subquery