diff --git a/jOOQ/src/main/java/org/jooq/AggregateFunction.java b/jOOQ/src/main/java/org/jooq/AggregateFunction.java
index 95a6974740..6ac17bad55 100644
--- a/jOOQ/src/main/java/org/jooq/AggregateFunction.java
+++ b/jOOQ/src/main/java/org/jooq/AggregateFunction.java
@@ -49,9 +49,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 
 /**
  * An aggregate function is a special field that is usually used in a
diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceRestartStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceRestartStep.java
index 4e89ca68d7..5175a3c2a2 100644
--- a/jOOQ/src/main/java/org/jooq/AlterSequenceRestartStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterSequenceRestartStep.java
@@ -49,15 +49,11 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * A {@link Query} that can alter sequences.
  *
  * @author Lukas Eder
  */
-@State
 public interface AlterSequenceRestartStep<T extends Number> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java b/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java
index 1fc41b78a2..a6965cd6d2 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTableAlterStep.java
@@ -56,15 +56,12 @@ import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-
 /**
  * The step in the <code>ALTER TABLE</code> DSL used to <code>ALTER</code>
  * columns.
  *
  * @author Lukas Eder
  */
-@State
 public interface AlterTableAlterStep<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterTableDropStep.java b/jOOQ/src/main/java/org/jooq/AlterTableDropStep.java
index 4827d03da7..80f8b32517 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTableDropStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTableDropStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * The step in the <code>ALTER TABLE</code> DSL used to <code>DROP</code>
@@ -48,7 +47,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface AlterTableDropStep extends AlterTableFinalStep {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/AlterTableStep.java b/jOOQ/src/main/java/org/jooq/AlterTableStep.java
index dbfb869c59..cc712f0bdb 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTableStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTableStep.java
@@ -40,14 +40,12 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * The step in the <code>ALTER TABLE</code> where the action can be decided.
  *
  * @author Lukas Eder
  */
-@State
 public interface AlterTableStep {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/BetweenAndStep.java b/jOOQ/src/main/java/org/jooq/BetweenAndStep.java
index e2a7b6732f..3bc713190b 100644
--- a/jOOQ/src/main/java/org/jooq/BetweenAndStep.java
+++ b/jOOQ/src/main/java/org/jooq/BetweenAndStep.java
@@ -40,8 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 /**
  * An intermediate DSL type for the construction of a <code>BETWEEN</code>
@@ -49,7 +47,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface BetweenAndStep<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/Delete.java b/jOOQ/src/main/java/org/jooq/Delete.java
index 94fd474a10..18464559bf 100644
--- a/jOOQ/src/main/java/org/jooq/Delete.java
+++ b/jOOQ/src/main/java/org/jooq/Delete.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * A {@link Query} that can delete data in the database.
diff --git a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
index f57ac9c2b1..e34aebe0c0 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 
@@ -57,7 +56,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java b/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java
index 8a4e93bf78..c97f5bb684 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the {@link Delete}'s DSL API.
@@ -55,7 +54,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface DeleteFinalStep<R extends Record> extends Delete<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
index ad89539451..fc9ea5ac35 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -59,7 +57,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
index 38b6c9266b..e74c5836ab 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 /**
@@ -49,7 +48,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface DivideByOnConditionStep extends DivideByReturningStep {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
index 68ca2797ce..3a0a5b6071 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
@@ -40,8 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/DivideByReturningStep.java b/jOOQ/src/main/java/org/jooq/DivideByReturningStep.java
index c878f4db58..e3bcdea5d9 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByReturningStep.java
@@ -42,9 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * An intermediate type for the construction of a relational division
  *
diff --git a/jOOQ/src/main/java/org/jooq/DropTableStep.java b/jOOQ/src/main/java/org/jooq/DropTableStep.java
index 411254f172..77d4b33517 100644
--- a/jOOQ/src/main/java/org/jooq/DropTableStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropTableStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * The step in the <code>DROP TABLE</code> DSL used to specify <code>DROP</code>
@@ -48,7 +47,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface DropTableStep extends DropTableFinalStep {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java
index c990a48599..dbacf6ee9a 100644
--- a/jOOQ/src/main/java/org/jooq/Field.java
+++ b/jOOQ/src/main/java/org/jooq/Field.java
@@ -62,8 +62,6 @@ import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Map;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.conf.Settings;
 import org.jooq.impl.DSL;
 import org.jooq.types.Interval;
diff --git a/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java b/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java
index 0fac8e9ce2..32187fe64a 100644
--- a/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java
+++ b/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java
@@ -53,8 +53,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 
@@ -64,7 +62,6 @@ import org.jooq.impl.DSL;
  * @author Lukas Eder
  * @see DSL#listAgg(Field)
  */
-@State
 public interface GroupConcatOrderByStep extends GroupConcatSeparatorStep {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java
index 2064e9e90b..8b5653234c 100644
--- a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java
+++ b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java
@@ -52,8 +52,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 import static org.jooq.SQLDialect.SQLITE;
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -62,7 +60,6 @@ import org.jooq.impl.DSL;
  * @author Lukas Eder
  * @see DSL#listAgg(Field)
  */
-@State
 public interface GroupConcatSeparatorStep extends AggregateFunction<String> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/GroupField.java b/jOOQ/src/main/java/org/jooq/GroupField.java
index a4832c736f..b24d8e6962 100644
--- a/jOOQ/src/main/java/org/jooq/GroupField.java
+++ b/jOOQ/src/main/java/org/jooq/GroupField.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * A <code>QueryPart</code> to be used exclusively in <code>GROUP BY</code>
diff --git a/jOOQ/src/main/java/org/jooq/Merge.java b/jOOQ/src/main/java/org/jooq/Merge.java
index beda97a766..8b9a931550 100644
--- a/jOOQ/src/main/java/org/jooq/Merge.java
+++ b/jOOQ/src/main/java/org/jooq/Merge.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * A {@link Query} that can merge data in the database.
diff --git a/jOOQ/src/main/java/org/jooq/MergeFinalStep.java b/jOOQ/src/main/java/org/jooq/MergeFinalStep.java
index 37f8417d39..e028d8e991 100644
--- a/jOOQ/src/main/java/org/jooq/MergeFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeFinalStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the {@link Merge}'s DSL API.
@@ -61,7 +60,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeFinalStep<R extends Record> extends Merge<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStepN.java b/jOOQ/src/main/java/org/jooq/MergeKeyStepN.java
index 6de5935acb..bc6accb6a6 100644
--- a/jOOQ/src/main/java/org/jooq/MergeKeyStepN.java
+++ b/jOOQ/src/main/java/org/jooq/MergeKeyStepN.java
@@ -50,9 +50,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the H2-specific variant of the {@link Merge}'s DSL API.
  * <p>
@@ -67,7 +64,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeKeyStepN<R extends Record> extends MergeValuesStepN<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java
index c86cc4be16..9c3be629c7 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java
@@ -43,9 +43,6 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Merge}'s DSL API.
  * <p>
@@ -65,7 +62,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeMatchedDeleteStep<R extends Record> extends MergeNotMatchedStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedSetMoreStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedSetMoreStep.java
index 2f565c73a3..325b054fa7 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedSetMoreStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedSetMoreStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the {@link Merge}'s DSL API.
@@ -61,7 +60,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeMatchedSetMoreStep<R extends Record>
    extends
        MergeMatchedSetStep<R>,
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedSetStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedSetStep.java
index 52c1269e96..adc9bb1d16 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedSetStep.java
@@ -49,9 +49,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 
 import java.util.Map;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Merge}'s DSL API.
  * <p>
@@ -71,7 +68,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeMatchedSetStep<R extends Record> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedStep.java
index 78d7ece5c9..6d90472dbc 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedStep.java
@@ -47,9 +47,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Merge}'s DSL API.
  * <p>
@@ -69,7 +66,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeMatchedStep<R extends Record> extends MergeNotMatchedStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java
index b12531f34f..e79b426033 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java
@@ -43,9 +43,6 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Merge}'s DSL API.
  * <p>
@@ -65,7 +62,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeMatchedWhereStep<R extends Record> extends MergeNotMatchedStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedSetMoreStep.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedSetMoreStep.java
index 08e8deb293..3a3f98aa11 100644
--- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedSetMoreStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedSetMoreStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the {@link Merge}'s DSL API.
@@ -61,7 +60,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeNotMatchedSetMoreStep<R extends Record>
    extends
        MergeNotMatchedSetStep<R>,
diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedSetStep.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedSetStep.java
index 6d5a715d9e..c264eac5bf 100644
--- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedSetStep.java
@@ -49,9 +49,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 
 import java.util.Map;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Merge}'s DSL API.
  * <p>
@@ -71,7 +68,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeNotMatchedSetStep<R extends Record> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedStep.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedStep.java
index 3fe49de785..767b383174 100644
--- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedStep.java
@@ -47,9 +47,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -74,7 +71,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface MergeNotMatchedStep<R extends Record> extends MergeFinalStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedValuesStepN.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedValuesStepN.java
index 669271cbe1..8c04ad6d44 100644
--- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedValuesStepN.java
+++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedValuesStepN.java
@@ -49,9 +49,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Merge}'s DSL API.
  * <p>
@@ -71,7 +68,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeNotMatchedValuesStepN<R extends Record> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java
index d563352df5..dd8577f2a8 100644
--- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java
@@ -43,9 +43,6 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Merge}'s DSL API.
  * <p>
@@ -65,7 +62,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeNotMatchedWhereStep<R extends Record> extends MergeFinalStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
index e02e96009c..40914978cf 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
@@ -47,7 +47,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 /**
@@ -69,7 +68,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnStep.java b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
index aca9c70323..8b1c6463ff 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
@@ -47,8 +47,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -70,7 +68,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeOnStep<R extends Record> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java
index 6d815df5f7..e892bf2c2f 100644
--- a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java
@@ -47,9 +47,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Merge}'s DSL API.
  * <p>
@@ -69,7 +66,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeUsingStep<R extends Record> extends MergeKeyStepN<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java b/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java
index a6e52caaf3..a535e81cb2 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java
@@ -50,9 +50,6 @@ import static org.jooq.SQLDialect.HSQLDB;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the H2-specific variant of the {@link Merge}'s DSL API.
  * <p>
@@ -67,7 +64,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface MergeValuesStepN<R extends Record> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java b/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java
index 02c2891900..6418febd5b 100644
--- a/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java
+++ b/jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java
@@ -53,9 +53,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * An ordered aggregate function.
  * <p>
@@ -79,7 +76,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface OrderedAggregateFunction<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/PivotForStep.java b/jOOQ/src/main/java/org/jooq/PivotForStep.java
index fa2a6bb00c..6d56c6fabb 100644
--- a/jOOQ/src/main/java/org/jooq/PivotForStep.java
+++ b/jOOQ/src/main/java/org/jooq/PivotForStep.java
@@ -43,9 +43,6 @@ package org.jooq;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the Oracle <code>PIVOT</code> clause DSL API, pivoting
  * {@link Table} objects to new tables.
diff --git a/jOOQ/src/main/java/org/jooq/PivotInStep.java b/jOOQ/src/main/java/org/jooq/PivotInStep.java
index 40a6d83450..62639eef4e 100644
--- a/jOOQ/src/main/java/org/jooq/PivotInStep.java
+++ b/jOOQ/src/main/java/org/jooq/PivotInStep.java
@@ -45,9 +45,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the Oracle <code>PIVOT</code> clause DSL API, pivoting
  * {@link Table} objects to new tables.
diff --git a/jOOQ/src/main/java/org/jooq/QuantifiedSelect.java b/jOOQ/src/main/java/org/jooq/QuantifiedSelect.java
index 0c8afe4e49..baf41c0ec1 100644
--- a/jOOQ/src/main/java/org/jooq/QuantifiedSelect.java
+++ b/jOOQ/src/main/java/org/jooq/QuantifiedSelect.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * A participant of a quantified comparison predicate
diff --git a/jOOQ/src/main/java/org/jooq/Query.java b/jOOQ/src/main/java/org/jooq/Query.java
index 5fd8727ade..c9c70411bc 100644
--- a/jOOQ/src/main/java/org/jooq/Query.java
+++ b/jOOQ/src/main/java/org/jooq/Query.java
@@ -46,7 +46,6 @@ import java.sql.Statement;
 import java.util.List;
 import java.util.Map;
 
-import org.jooq.api.annotation.State;
 import org.jooq.conf.ParamType;
 import org.jooq.conf.Settings;
 import org.jooq.conf.StatementType;
diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java
index 40b81b8057..fc287de207 100644
--- a/jOOQ/src/main/java/org/jooq/ResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java
@@ -48,7 +48,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
-import org.jooq.api.annotation.State;
 import org.jooq.conf.Settings;
 import org.jooq.exception.DataAccessException;
 import org.jooq.exception.DataTypeException;
@@ -72,7 +71,6 @@ import org.jooq.impl.DefaultRecordMapper;
  *
  * @author Lukas Eder
  */
-@State
 public interface ResultQuery<R extends Record> extends Query {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/Row.java b/jOOQ/src/main/java/org/jooq/Row.java
index 903f2c760c..b2859ef88d 100644
--- a/jOOQ/src/main/java/org/jooq/Row.java
+++ b/jOOQ/src/main/java/org/jooq/Row.java
@@ -40,8 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 /**
  * A model type for a row value expression.
diff --git a/jOOQ/src/main/java/org/jooq/Row1.java b/jOOQ/src/main/java/org/jooq/Row1.java
index 5a94b2b0bc..f0950388c7 100644
--- a/jOOQ/src/main/java/org/jooq/Row1.java
+++ b/jOOQ/src/main/java/org/jooq/Row1.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row1<T1> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row10.java b/jOOQ/src/main/java/org/jooq/Row10.java
index 3466fe24ae..dba2eef71c 100644
--- a/jOOQ/src/main/java/org/jooq/Row10.java
+++ b/jOOQ/src/main/java/org/jooq/Row10.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row11.java b/jOOQ/src/main/java/org/jooq/Row11.java
index 3769e53b2f..439e1042b1 100644
--- a/jOOQ/src/main/java/org/jooq/Row11.java
+++ b/jOOQ/src/main/java/org/jooq/Row11.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row12.java b/jOOQ/src/main/java/org/jooq/Row12.java
index 5cf6125dd5..6c62f927c9 100644
--- a/jOOQ/src/main/java/org/jooq/Row12.java
+++ b/jOOQ/src/main/java/org/jooq/Row12.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row13.java b/jOOQ/src/main/java/org/jooq/Row13.java
index eaff4e6f08..0b4a87bdf1 100644
--- a/jOOQ/src/main/java/org/jooq/Row13.java
+++ b/jOOQ/src/main/java/org/jooq/Row13.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row14.java b/jOOQ/src/main/java/org/jooq/Row14.java
index 37e04f90be..ea6888599d 100644
--- a/jOOQ/src/main/java/org/jooq/Row14.java
+++ b/jOOQ/src/main/java/org/jooq/Row14.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row15.java b/jOOQ/src/main/java/org/jooq/Row15.java
index c2ed6ed614..3974ec999e 100644
--- a/jOOQ/src/main/java/org/jooq/Row15.java
+++ b/jOOQ/src/main/java/org/jooq/Row15.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row16.java b/jOOQ/src/main/java/org/jooq/Row16.java
index 002a4a2012..7998bca458 100644
--- a/jOOQ/src/main/java/org/jooq/Row16.java
+++ b/jOOQ/src/main/java/org/jooq/Row16.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row17.java b/jOOQ/src/main/java/org/jooq/Row17.java
index 0ac32e9516..9e13e351e1 100644
--- a/jOOQ/src/main/java/org/jooq/Row17.java
+++ b/jOOQ/src/main/java/org/jooq/Row17.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row18.java b/jOOQ/src/main/java/org/jooq/Row18.java
index c25edcffd2..6d0d4f2ab6 100644
--- a/jOOQ/src/main/java/org/jooq/Row18.java
+++ b/jOOQ/src/main/java/org/jooq/Row18.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row19.java b/jOOQ/src/main/java/org/jooq/Row19.java
index 9eee5c6fa6..58941e598e 100644
--- a/jOOQ/src/main/java/org/jooq/Row19.java
+++ b/jOOQ/src/main/java/org/jooq/Row19.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row2.java b/jOOQ/src/main/java/org/jooq/Row2.java
index 93fa934c25..6fcb204600 100644
--- a/jOOQ/src/main/java/org/jooq/Row2.java
+++ b/jOOQ/src/main/java/org/jooq/Row2.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row2<T1, T2> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row20.java b/jOOQ/src/main/java/org/jooq/Row20.java
index c92cd3c590..8131a4ec1b 100644
--- a/jOOQ/src/main/java/org/jooq/Row20.java
+++ b/jOOQ/src/main/java/org/jooq/Row20.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row21.java b/jOOQ/src/main/java/org/jooq/Row21.java
index 707557646b..73a3a1e3b9 100644
--- a/jOOQ/src/main/java/org/jooq/Row21.java
+++ b/jOOQ/src/main/java/org/jooq/Row21.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row22.java b/jOOQ/src/main/java/org/jooq/Row22.java
index daa8c0a8e1..133a307fe8 100644
--- a/jOOQ/src/main/java/org/jooq/Row22.java
+++ b/jOOQ/src/main/java/org/jooq/Row22.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row3.java b/jOOQ/src/main/java/org/jooq/Row3.java
index c4136ce6b9..fcf1accdf1 100644
--- a/jOOQ/src/main/java/org/jooq/Row3.java
+++ b/jOOQ/src/main/java/org/jooq/Row3.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row3<T1, T2, T3> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row4.java b/jOOQ/src/main/java/org/jooq/Row4.java
index e21376dbb0..92f11df440 100644
--- a/jOOQ/src/main/java/org/jooq/Row4.java
+++ b/jOOQ/src/main/java/org/jooq/Row4.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row4<T1, T2, T3, T4> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row5.java b/jOOQ/src/main/java/org/jooq/Row5.java
index b8f62f527c..4a69d09480 100644
--- a/jOOQ/src/main/java/org/jooq/Row5.java
+++ b/jOOQ/src/main/java/org/jooq/Row5.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row5<T1, T2, T3, T4, T5> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row6.java b/jOOQ/src/main/java/org/jooq/Row6.java
index ac09291ba8..11880d3863 100644
--- a/jOOQ/src/main/java/org/jooq/Row6.java
+++ b/jOOQ/src/main/java/org/jooq/Row6.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row6<T1, T2, T3, T4, T5, T6> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row7.java b/jOOQ/src/main/java/org/jooq/Row7.java
index a794ce066f..23d4358708 100644
--- a/jOOQ/src/main/java/org/jooq/Row7.java
+++ b/jOOQ/src/main/java/org/jooq/Row7.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row7<T1, T2, T3, T4, T5, T6, T7> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row8.java b/jOOQ/src/main/java/org/jooq/Row8.java
index 7ea18fa6c3..6193d67837 100644
--- a/jOOQ/src/main/java/org/jooq/Row8.java
+++ b/jOOQ/src/main/java/org/jooq/Row8.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row8<T1, T2, T3, T4, T5, T6, T7, T8> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Row9.java b/jOOQ/src/main/java/org/jooq/Row9.java
index e4677cb96c..8d3b5e7e7c 100644
--- a/jOOQ/src/main/java/org/jooq/Row9.java
+++ b/jOOQ/src/main/java/org/jooq/Row9.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface Row9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/RowN.java b/jOOQ/src/main/java/org/jooq/RowN.java
index cd2461dbd9..9027a10ea9 100644
--- a/jOOQ/src/main/java/org/jooq/RowN.java
+++ b/jOOQ/src/main/java/org/jooq/RowN.java
@@ -40,9 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.Comparator;
-import org.jooq.api.annotation.State;
-
 import java.util.Collection;
 
 import javax.annotation.Generated;
@@ -57,7 +54,6 @@ import javax.annotation.Generated;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface RowN extends Row {
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/Select.java b/jOOQ/src/main/java/org/jooq/Select.java
index 8882cb44e2..a11a8a211e 100644
--- a/jOOQ/src/main/java/org/jooq/Select.java
+++ b/jOOQ/src/main/java/org/jooq/Select.java
@@ -42,7 +42,6 @@ package org.jooq;
 
 import java.util.List;
 
-import org.jooq.api.annotation.State;
 import org.jooq.exception.DataAccessException;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
index 762273410c..c2a1939e88 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 
@@ -86,7 +85,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectConditionStep<R extends Record> extends SelectConnectByStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
index 256ab3075f..1bc210ad37 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
@@ -43,7 +43,6 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 /**
@@ -88,7 +87,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectConnectByConditionStep<R extends Record> extends SelectStartWithStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
index e91e0530ba..b8282354a2 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
@@ -43,8 +43,6 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -89,7 +87,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectConnectByStep<R extends Record> extends SelectGroupByStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectFinalStep.java b/jOOQ/src/main/java/org/jooq/SelectFinalStep.java
index 2440d9c500..622129ca9a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectFinalStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -84,7 +83,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectFinalStep<R extends Record> extends Select<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectForUpdateOfStep.java b/jOOQ/src/main/java/org/jooq/SelectForUpdateOfStep.java
index 8447a2384c..c50d67c3bb 100644
--- a/jOOQ/src/main/java/org/jooq/SelectForUpdateOfStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectForUpdateOfStep.java
@@ -52,9 +52,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -97,7 +94,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectForUpdateOfStep<R extends Record> extends SelectForUpdateWaitStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java b/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java
index a9f12a0b93..59a22845d4 100644
--- a/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectForUpdateStep.java
@@ -55,9 +55,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -100,7 +97,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectForUpdateStep<R extends Record> extends SelectOptionStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java b/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java
index 175ae2607c..49f752cad9 100644
--- a/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java
@@ -43,9 +43,6 @@ package org.jooq;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -88,7 +85,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectForUpdateWaitStep<R extends Record> extends SelectOptionStep<R> {
 
     /* [pro] xx
diff --git a/jOOQ/src/main/java/org/jooq/SelectFromStep.java b/jOOQ/src/main/java/org/jooq/SelectFromStep.java
index 35e5daacdd..94f607b0d4 100644
--- a/jOOQ/src/main/java/org/jooq/SelectFromStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectFromStep.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -88,7 +86,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectFromStep<R extends Record> extends SelectWhereStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectGroupByStep.java b/jOOQ/src/main/java/org/jooq/SelectGroupByStep.java
index ce3f12d236..f006d630df 100644
--- a/jOOQ/src/main/java/org/jooq/SelectGroupByStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectGroupByStep.java
@@ -42,9 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -87,7 +84,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectGroupByStep<R extends Record> extends SelectHavingStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
index bdfd055ab8..62a269edaf 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 
@@ -86,7 +85,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectHavingConditionStep<R extends Record> extends SelectWindowStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
index ae220f973f..760f3ff084 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -88,7 +86,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectHavingStep<R extends Record> extends SelectWindowStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinPartitionByStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinPartitionByStep.java
index ed40a11769..d041e93737 100644
--- a/jOOQ/src/main/java/org/jooq/SelectJoinPartitionByStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectJoinPartitionByStep.java
@@ -44,8 +44,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -88,7 +86,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectJoinPartitionByStep<R extends Record> extends SelectOnStep<R> {
 
     /* [pro] xx
diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
index fd462b96e4..554eb5cf8f 100644
--- a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
@@ -58,7 +58,6 @@ import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 /**
@@ -103,7 +102,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectLimitStep.java b/jOOQ/src/main/java/org/jooq/SelectLimitStep.java
index 2511dcdf0d..b23859cce8 100644
--- a/jOOQ/src/main/java/org/jooq/SelectLimitStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectLimitStep.java
@@ -55,9 +55,6 @@ import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -100,7 +97,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectLimitStep<R extends Record> extends SelectForUpdateStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java b/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java
index 6e2d8fbc6d..278fd2f699 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java
@@ -55,9 +55,6 @@ import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -100,7 +97,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectOffsetStep<R extends Record> extends SelectForUpdateStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
index 2f8c420624..9e0f1a8bb1 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 
@@ -86,7 +85,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectOnStep.java b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
index de3f69eed7..b1f359e8d9 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.DSL;
 
@@ -89,7 +87,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectOnStep<R extends Record> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectOptionStep.java b/jOOQ/src/main/java/org/jooq/SelectOptionStep.java
index ff571cfa6c..17e2dc4cdf 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOptionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOptionStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -84,7 +83,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectOptionStep<R extends Record> extends SelectFinalStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectOptionalOnStep.java b/jOOQ/src/main/java/org/jooq/SelectOptionalOnStep.java
index a98466c508..8b2791c418 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOptionalOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOptionalOnStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -84,7 +83,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectOptionalOnStep<R extends Record> extends SelectJoinStep<R>, SelectJoinPartitionByStep<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java b/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java
index c1916f5f63..bf3ba1c422 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java
@@ -47,9 +47,6 @@ import java.util.Collection;
 
 import javax.annotation.Generated;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -92,7 +89,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectOrderByStep<R extends Record> extends SelectLimitStep<R> {
 
 // [jooq-tools] START [order-by-field-array]
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java b/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java
index a5f60646d8..cf0468519a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekLimitStep.java
@@ -54,9 +54,6 @@ import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -99,7 +96,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectSeekLimitStep<R extends Record> extends SelectForUpdateStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep1.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep1.java
index 1dfc9727b2..a397637a4a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep1.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep1.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep10.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep10.java
index bbeec30da2..e9600e9e39 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep10.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep10.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep11.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep11.java
index 660eb70c4b..35f5b7d941 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep11.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep11.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep12.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep12.java
index 2596774da7..5e45b0bb92 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep12.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep12.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep13.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep13.java
index d04961bda2..4c1b127d8f 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep13.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep13.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep14.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep14.java
index 75ffd560a3..a0f9235410 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep14.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep14.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep15.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep15.java
index ed9ad13a76..8511f1f898 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep15.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep15.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep16.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep16.java
index c1610a21f3..244c69bf0a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep16.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep16.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep17.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep17.java
index 5f0a2f33bb..92abd7ed94 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep17.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep17.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep18.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep18.java
index 6779412f4f..dd231e3ac4 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep18.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep18.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep19.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep19.java
index faa4378d3f..28d73c16d1 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep19.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep19.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep2.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep2.java
index 0d1137a463..f4818a80a5 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep2.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep2.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep20.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep20.java
index ce39f37d6f..963f05a5cd 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep20.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep20.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep21.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep21.java
index d6fec7fa58..00ef5a1889 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep21.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep21.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep22.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep22.java
index 70d059b858..550cc04560 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep22.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep22.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep3.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep3.java
index b73d3ecdc1..ce0c0d67bc 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep3.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep3.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep4.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep4.java
index 1f7aaa543e..321304e6d7 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep4.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep4.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep5.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep5.java
index adc981cdfc..c1c359ebd6 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep5.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep5.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep6.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep6.java
index d99d746832..636b10d21a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep6.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep6.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep7.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep7.java
index f61e7cf807..4a8d7d5b6a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep7.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep7.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep8.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep8.java
index 9d69fe45c1..bbb5c10373 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep8.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep8.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSeekStep9.java b/jOOQ/src/main/java/org/jooq/SelectSeekStep9.java
index ee522d590d..11f2258d0f 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSeekStep9.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSeekStep9.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
-import org.jooq.Record;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
diff --git a/jOOQ/src/main/java/org/jooq/SelectSelectStep.java b/jOOQ/src/main/java/org/jooq/SelectSelectStep.java
index 074b0dddbd..894cb6b9fb 100644
--- a/jOOQ/src/main/java/org/jooq/SelectSelectStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectSelectStep.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -87,7 +85,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectSelectStep<R extends Record> extends SelectFromStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
index 1bfaa4c9ea..b99599a3a5 100644
--- a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
@@ -43,8 +43,6 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -89,7 +87,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectStartWithStep<R extends Record> extends SelectGroupByStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
index 7aaf707c8c..f515b3d9f1 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -88,7 +86,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectWhereStep<R extends Record> extends SelectConnectByStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java
index 546b3ae41b..d7066382db 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java
@@ -49,8 +49,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.
@@ -93,7 +91,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface SelectWindowStep<R extends Record> extends SelectOrderByStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SortField.java b/jOOQ/src/main/java/org/jooq/SortField.java
index aa52ad22b6..5ab08d0623 100644
--- a/jOOQ/src/main/java/org/jooq/SortField.java
+++ b/jOOQ/src/main/java/org/jooq/SortField.java
@@ -40,8 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 /**
  * A wrapper for a {@link Field} and a {@link SortField}
diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java
index 8460f3bcec..94e71b3384 100644
--- a/jOOQ/src/main/java/org/jooq/Table.java
+++ b/jOOQ/src/main/java/org/jooq/Table.java
@@ -64,8 +64,6 @@ import java.sql.Timestamp;
 import java.util.Collection;
 import java.util.List;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.conf.Settings;
 import org.jooq.impl.DSL;
 
diff --git a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
index 32b61be32a..ef8aaefa88 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 
@@ -52,7 +51,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface TableOnConditionStep extends Table<Record> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/TableOnStep.java b/jOOQ/src/main/java/org/jooq/TableOnStep.java
index 37c63204d2..21a01ff83b 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnStep.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.DSL;
 
@@ -55,7 +53,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface TableOnStep {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/TablePartitionByStep.java b/jOOQ/src/main/java/org/jooq/TablePartitionByStep.java
index b9170f5462..413c39c0a5 100644
--- a/jOOQ/src/main/java/org/jooq/TablePartitionByStep.java
+++ b/jOOQ/src/main/java/org/jooq/TablePartitionByStep.java
@@ -44,9 +44,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * An intermediate type for the construction of a partitioned
  * {@link SQLDialect#ORACLE} <code>OUTER JOIN</code> clause.
@@ -60,7 +57,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface TablePartitionByStep extends TableOnStep {
 
     /* [pro] xx
diff --git a/jOOQ/src/main/java/org/jooq/Truncate.java b/jOOQ/src/main/java/org/jooq/Truncate.java
index 1f82aeafef..2c9229bcc1 100644
--- a/jOOQ/src/main/java/org/jooq/Truncate.java
+++ b/jOOQ/src/main/java/org/jooq/Truncate.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * A {@link Query} that can truncate a table in the database.
diff --git a/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java b/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java
index 7c3103cd9f..2e5904fa99 100644
--- a/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java
+++ b/jOOQ/src/main/java/org/jooq/TruncateCascadeStep.java
@@ -42,15 +42,11 @@ package org.jooq;
 
 import static org.jooq.SQLDialect.POSTGRES;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * A {@link Query} that can truncate a table in the database.
  *
  * @author Lukas Eder
  */
-@State
 public interface TruncateCascadeStep<R extends Record> extends TruncateFinalStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java b/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java
index 0679e994ee..85e39a271e 100644
--- a/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java
@@ -40,14 +40,12 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * A {@link Query} that can truncate a table in the database.
  *
  * @author Lukas Eder
  */
-@State
 public interface TruncateFinalStep<R extends Record> extends Truncate<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java b/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java
index 49237bfae9..effcf9a7ca 100644
--- a/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java
+++ b/jOOQ/src/main/java/org/jooq/TruncateIdentityStep.java
@@ -43,15 +43,11 @@ package org.jooq;
 import static org.jooq.SQLDialect.HSQLDB;
 import static org.jooq.SQLDialect.POSTGRES;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * A {@link Query} that can truncate a table in the database.
  *
  * @author Lukas Eder
  */
-@State
 public interface TruncateIdentityStep<R extends Record> extends TruncateCascadeStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/Update.java b/jOOQ/src/main/java/org/jooq/Update.java
index 4e00ee3497..12deeedb4c 100644
--- a/jOOQ/src/main/java/org/jooq/Update.java
+++ b/jOOQ/src/main/java/org/jooq/Update.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * A {@link Query} that can update data in the database.
diff --git a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
index 45f0078249..48e24e8901 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 import org.jooq.impl.DSL;
 
 
@@ -59,7 +58,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R>, UpdateReturningStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java b/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java
index b922e4de27..abd607b428 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the {@link Update}'s DSL API.
@@ -57,7 +56,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface UpdateFinalStep<R extends Record> extends Update<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/UpdateFromStep.java b/jOOQ/src/main/java/org/jooq/UpdateFromStep.java
index c2e9aeb249..de46621872 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateFromStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateFromStep.java
@@ -47,8 +47,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -66,7 +64,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface UpdateFromStep<R extends Record> extends UpdateWhereStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/UpdateSetFirstStep.java b/jOOQ/src/main/java/org/jooq/UpdateSetFirstStep.java
index 17b139e9eb..060f890cbd 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateSetFirstStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateSetFirstStep.java
@@ -49,9 +49,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 
 import javax.annotation.Generated;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Update}'s DSL API.
  * <p>
@@ -67,7 +64,6 @@ import org.jooq.api.annotation.Transition;
  * @author Lukas Eder
  */
 @Generated("This class was generated using jOOQ-tools")
-@State
 public interface UpdateSetFirstStep<R extends Record> extends UpdateSetStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/UpdateSetMoreStep.java b/jOOQ/src/main/java/org/jooq/UpdateSetMoreStep.java
index cf1e768a5b..7543942783 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateSetMoreStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateSetMoreStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the {@link Update}'s DSL API.
@@ -57,7 +56,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface UpdateSetMoreStep<R extends Record> extends UpdateSetStep<R>, UpdateFromStep<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/UpdateSetStep.java b/jOOQ/src/main/java/org/jooq/UpdateSetStep.java
index 36555efe24..4030cf2efb 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateSetStep.java
@@ -42,9 +42,6 @@ package org.jooq;
 
 import java.util.Map;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the {@link Update}'s DSL API.
  * <p>
@@ -60,7 +57,6 @@ import org.jooq.api.annotation.Transition;
  *
  * @author Lukas Eder
  */
-@State
 public interface UpdateSetStep<R extends Record> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
index c58fa1f2a0..21df9b681f 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
@@ -42,8 +42,6 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 /**
@@ -61,7 +59,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R>, UpdateReturningStep<R> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/VersionsBetweenAndStep.java b/jOOQ/src/main/java/org/jooq/VersionsBetweenAndStep.java
index f3e6ea27c9..bbc3538af9 100644
--- a/jOOQ/src/main/java/org/jooq/VersionsBetweenAndStep.java
+++ b/jOOQ/src/main/java/org/jooq/VersionsBetweenAndStep.java
@@ -44,9 +44,6 @@ package org.jooq;
 
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
 xxx
  x xxxx xxxx xx xxxx xxx xxx xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxx xxx xxxx
  x xxxxxxxxx xxxxxx xx xxx xxxxxxxxx xxxxxxxx xxxxx xxxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/WindowBeforeOverStep.java b/jOOQ/src/main/java/org/jooq/WindowBeforeOverStep.java
index c303160be4..b1bb2c59e7 100644
--- a/jOOQ/src/main/java/org/jooq/WindowBeforeOverStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowBeforeOverStep.java
@@ -50,9 +50,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 
 /**
  * This type is used for the window function DSL API.
@@ -73,7 +70,6 @@ import org.jooq.api.annotation.Transition;
  * @param <T> The function return type
  * @author Lukas Eder
  */
-@State
 public interface WindowBeforeOverStep<T> extends WindowOverStep<T>, Field<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/WindowFinalStep.java b/jOOQ/src/main/java/org/jooq/WindowFinalStep.java
index debd85fbb5..05c2ec48f6 100644
--- a/jOOQ/src/main/java/org/jooq/WindowFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowFinalStep.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import org.jooq.api.annotation.State;
 
 /**
  * This type is used for the window function DSL API.
diff --git a/jOOQ/src/main/java/org/jooq/WindowIgnoreNullsStep.java b/jOOQ/src/main/java/org/jooq/WindowIgnoreNullsStep.java
index 83ef736cff..cb4e30a66e 100644
--- a/jOOQ/src/main/java/org/jooq/WindowIgnoreNullsStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowIgnoreNullsStep.java
@@ -44,9 +44,6 @@ package org.jooq;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the window function DSL API.
  * <p>
@@ -63,7 +60,6 @@ import org.jooq.api.annotation.Transition;
  * @param <T> The function return type
  * @author Lukas Eder
  */
-@State
 public interface WindowIgnoreNullsStep<T> extends WindowOverStep<T> {
 
     /* [pro] xx
diff --git a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java
index 84c76e0292..51ab799afc 100644
--- a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java
@@ -49,9 +49,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 
 import java.util.Collection;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the window function DSL API.
  * <p>
@@ -68,7 +65,6 @@ import org.jooq.api.annotation.Transition;
  * @param <T> The function return type
  * @author Lukas Eder
  */
-@State
 public interface WindowOrderByStep<T> extends WindowFinalStep<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/WindowOverStep.java b/jOOQ/src/main/java/org/jooq/WindowOverStep.java
index 4fe6ca34a7..16fed4be5d 100644
--- a/jOOQ/src/main/java/org/jooq/WindowOverStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowOverStep.java
@@ -50,9 +50,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the window function DSL API.
  * <p>
@@ -72,7 +69,6 @@ import org.jooq.api.annotation.Transition;
  * @param <T> The function return type
  * @author Lukas Eder
  */
-@State
 public interface WindowOverStep<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java
index 8fb3fc5763..38c0d7a04a 100644
--- a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java
@@ -47,9 +47,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the window function DSL API.
  * <p>
@@ -66,7 +63,6 @@ import org.jooq.api.annotation.Transition;
  * @param <T> The function return type
  * @author Lukas Eder
  */
-@State
 public interface WindowPartitionByStep<T> extends WindowOrderByStep<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java b/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java
index c5cd5714b9..fe4b374e13 100644
--- a/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowRowsAndStep.java
@@ -46,9 +46,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the window function DSL API.
  * <p>
@@ -65,7 +62,6 @@ import org.jooq.api.annotation.Transition;
  * @param <T> The function return type
  * @author Lukas Eder
  */
-@State
 public interface WindowRowsAndStep<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java
index 7fa5935fa5..88dcdf8f00 100644
--- a/jOOQ/src/main/java/org/jooq/WindowRowsStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowRowsStep.java
@@ -46,9 +46,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
-
 /**
  * This type is used for the window function DSL API.
  * <p>
@@ -65,7 +62,6 @@ import org.jooq.api.annotation.Transition;
  * @param <T> The function return type
  * @author Lukas Eder
  */
-@State
 public interface WindowRowsStep<T> extends WindowFinalStep<T> {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/WithAsStep.java b/jOOQ/src/main/java/org/jooq/WithAsStep.java
index e63df2f864..8940e7ad18 100644
--- a/jOOQ/src/main/java/org/jooq/WithAsStep.java
+++ b/jOOQ/src/main/java/org/jooq/WithAsStep.java
@@ -48,8 +48,6 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 
-import org.jooq.api.annotation.State;
-
 /**
  * This type is part of the jOOQ DSL to create {@link Select}, {@link Insert},
  * {@link Update}, {@link Delete}, {@link Merge} statements prefixed with a
@@ -67,7 +65,6 @@ import org.jooq.api.annotation.State;
  *
  * @author Lukas Eder
  */
-@State
 public interface WithAsStep {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/WithStep.java b/jOOQ/src/main/java/org/jooq/WithStep.java
index 1a555eeedc..2e01734c0d 100644
--- a/jOOQ/src/main/java/org/jooq/WithStep.java
+++ b/jOOQ/src/main/java/org/jooq/WithStep.java
@@ -54,8 +54,6 @@ import java.util.Collection;
 
 import javax.annotation.Generated;
 
-import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 import org.jooq.impl.DSL;
 
 
@@ -76,7 +74,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-@State
 public interface WithStep extends QueryPart {
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/exception/MappingException.java b/jOOQ/src/main/java/org/jooq/exception/MappingException.java
index 904b273383..05960f080f 100644
--- a/jOOQ/src/main/java/org/jooq/exception/MappingException.java
+++ b/jOOQ/src/main/java/org/jooq/exception/MappingException.java
@@ -40,8 +40,8 @@
  */
 package org.jooq.exception;
 
-import org.jooq.DSLContext;
 import org.jooq.Cursor;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.ResultQuery;
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
index 2981486457..f1e8671de3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
@@ -58,14 +58,6 @@ import org.jooq.InsertResultStep;
 import org.jooq.InsertSetMoreStep;
 import org.jooq.InsertSetStep;
 import org.jooq.InsertValuesStep1;
-import org.jooq.InsertValuesStep2;
-import org.jooq.InsertValuesStep3;
-import org.jooq.InsertValuesStep4;
-import org.jooq.InsertValuesStep5;
-import org.jooq.InsertValuesStep6;
-import org.jooq.InsertValuesStep7;
-import org.jooq.InsertValuesStep8;
-import org.jooq.InsertValuesStep9;
 import org.jooq.InsertValuesStep10;
 import org.jooq.InsertValuesStep11;
 import org.jooq.InsertValuesStep12;
@@ -76,9 +68,17 @@ import org.jooq.InsertValuesStep16;
 import org.jooq.InsertValuesStep17;
 import org.jooq.InsertValuesStep18;
 import org.jooq.InsertValuesStep19;
+import org.jooq.InsertValuesStep2;
 import org.jooq.InsertValuesStep20;
 import org.jooq.InsertValuesStep21;
 import org.jooq.InsertValuesStep22;
+import org.jooq.InsertValuesStep3;
+import org.jooq.InsertValuesStep4;
+import org.jooq.InsertValuesStep5;
+import org.jooq.InsertValuesStep6;
+import org.jooq.InsertValuesStep7;
+import org.jooq.InsertValuesStep8;
+import org.jooq.InsertValuesStep9;
 import org.jooq.InsertValuesStepN;
 import org.jooq.Record;
 import org.jooq.Record1;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java
index b73c7640c6..66f587f434 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java
@@ -47,14 +47,6 @@ import javax.annotation.Generated;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record1;
-import org.jooq.Record2;
-import org.jooq.Record3;
-import org.jooq.Record4;
-import org.jooq.Record5;
-import org.jooq.Record6;
-import org.jooq.Record7;
-import org.jooq.Record8;
-import org.jooq.Record9;
 import org.jooq.Record10;
 import org.jooq.Record11;
 import org.jooq.Record12;
@@ -65,9 +57,17 @@ import org.jooq.Record16;
 import org.jooq.Record17;
 import org.jooq.Record18;
 import org.jooq.Record19;
+import org.jooq.Record2;
 import org.jooq.Record20;
 import org.jooq.Record21;
 import org.jooq.Record22;
+import org.jooq.Record3;
+import org.jooq.Record4;
+import org.jooq.Record5;
+import org.jooq.Record6;
+import org.jooq.Record7;
+import org.jooq.Record8;
+import org.jooq.Record9;
 
 /**
  * A general purpose record, typically used for ad-hoc types.
diff --git a/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java b/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java
index 2cb1f51d3c..21337c5197 100644
--- a/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java
@@ -42,10 +42,8 @@ package org.jooq.test;
 
 import static org.jooq.impl.DSL.val;
 
-import org.jooq.BindContext;
 import org.jooq.Context;
 import org.jooq.QueryPart;
-import org.jooq.RenderContext;
 import org.jooq.impl.CustomQueryPart;
 import org.jooq.impl.DSL;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java
index 6616bffc35..bcfcdb5fca 100644
--- a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java
@@ -41,9 +41,9 @@
 
 package org.jooq.test;
 
-import static org.junit.Assert.assertTrue;
 import static org.jooq.impl.DSL.fieldByName;
 import static org.jooq.impl.DSL.val;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Timestamp;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java b/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java
index eb8cb1f11d..f8d1eff578 100644
--- a/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java
@@ -40,10 +40,8 @@
  */
 package org.jooq.test;
 
-import org.jooq.BindContext;
 import org.jooq.Context;
 import org.jooq.RenderContext;
-import org.jooq.exception.DataAccessException;
 import org.jooq.impl.CustomCondition;
 
 import org.junit.Test;