diff --git a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
index 10a3cf6052..f6dca47c3e 100644
--- a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
@@ -62,7 +62,6 @@ class Rows extends Generators {
 
             import org.jooq.Comparator;
             import org.jooq.api.annotation.State;
-            import org.jooq.api.annotation.Transition;
 
             import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row1.java b/jOOQ/src/main/java/org/jooq/Row1.java
index 5c4350547e..6b009ed2e6 100644
--- a/jOOQ/src/main/java/org/jooq/Row1.java
+++ b/jOOQ/src/main/java/org/jooq/Row1.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row10.java b/jOOQ/src/main/java/org/jooq/Row10.java
index 557a55ca30..ae9b4b0af3 100644
--- a/jOOQ/src/main/java/org/jooq/Row10.java
+++ b/jOOQ/src/main/java/org/jooq/Row10.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row11.java b/jOOQ/src/main/java/org/jooq/Row11.java
index e9ed412c8c..9c3d7089b1 100644
--- a/jOOQ/src/main/java/org/jooq/Row11.java
+++ b/jOOQ/src/main/java/org/jooq/Row11.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row12.java b/jOOQ/src/main/java/org/jooq/Row12.java
index f422e2ef8b..46d4e7d98b 100644
--- a/jOOQ/src/main/java/org/jooq/Row12.java
+++ b/jOOQ/src/main/java/org/jooq/Row12.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row13.java b/jOOQ/src/main/java/org/jooq/Row13.java
index 98892dde62..55da841ce3 100644
--- a/jOOQ/src/main/java/org/jooq/Row13.java
+++ b/jOOQ/src/main/java/org/jooq/Row13.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row14.java b/jOOQ/src/main/java/org/jooq/Row14.java
index 8a34d97d74..a16609ac63 100644
--- a/jOOQ/src/main/java/org/jooq/Row14.java
+++ b/jOOQ/src/main/java/org/jooq/Row14.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row15.java b/jOOQ/src/main/java/org/jooq/Row15.java
index 7678cf0b13..17cca44e9d 100644
--- a/jOOQ/src/main/java/org/jooq/Row15.java
+++ b/jOOQ/src/main/java/org/jooq/Row15.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row16.java b/jOOQ/src/main/java/org/jooq/Row16.java
index 7901797fd1..ef93aa296c 100644
--- a/jOOQ/src/main/java/org/jooq/Row16.java
+++ b/jOOQ/src/main/java/org/jooq/Row16.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row17.java b/jOOQ/src/main/java/org/jooq/Row17.java
index c4f6ffbdf5..7a903ef9d4 100644
--- a/jOOQ/src/main/java/org/jooq/Row17.java
+++ b/jOOQ/src/main/java/org/jooq/Row17.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row18.java b/jOOQ/src/main/java/org/jooq/Row18.java
index ac62b863e9..6cddd9762e 100644
--- a/jOOQ/src/main/java/org/jooq/Row18.java
+++ b/jOOQ/src/main/java/org/jooq/Row18.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row19.java b/jOOQ/src/main/java/org/jooq/Row19.java
index ec9674050f..64cd163fd4 100644
--- a/jOOQ/src/main/java/org/jooq/Row19.java
+++ b/jOOQ/src/main/java/org/jooq/Row19.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row2.java b/jOOQ/src/main/java/org/jooq/Row2.java
index 18ddcca4ae..c2a6f52979 100644
--- a/jOOQ/src/main/java/org/jooq/Row2.java
+++ b/jOOQ/src/main/java/org/jooq/Row2.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row20.java b/jOOQ/src/main/java/org/jooq/Row20.java
index b0d1f86b6d..0c0edec724 100644
--- a/jOOQ/src/main/java/org/jooq/Row20.java
+++ b/jOOQ/src/main/java/org/jooq/Row20.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row21.java b/jOOQ/src/main/java/org/jooq/Row21.java
index bee5b11e4f..cade2ad4f7 100644
--- a/jOOQ/src/main/java/org/jooq/Row21.java
+++ b/jOOQ/src/main/java/org/jooq/Row21.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row22.java b/jOOQ/src/main/java/org/jooq/Row22.java
index 0f1c634373..2360485f7f 100644
--- a/jOOQ/src/main/java/org/jooq/Row22.java
+++ b/jOOQ/src/main/java/org/jooq/Row22.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row3.java b/jOOQ/src/main/java/org/jooq/Row3.java
index a6c1e045c6..8621c2dedd 100644
--- a/jOOQ/src/main/java/org/jooq/Row3.java
+++ b/jOOQ/src/main/java/org/jooq/Row3.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row4.java b/jOOQ/src/main/java/org/jooq/Row4.java
index 549ee44ac5..d13487220b 100644
--- a/jOOQ/src/main/java/org/jooq/Row4.java
+++ b/jOOQ/src/main/java/org/jooq/Row4.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row5.java b/jOOQ/src/main/java/org/jooq/Row5.java
index 3b0980c2d5..57c13f352d 100644
--- a/jOOQ/src/main/java/org/jooq/Row5.java
+++ b/jOOQ/src/main/java/org/jooq/Row5.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row6.java b/jOOQ/src/main/java/org/jooq/Row6.java
index a48676b7f8..29579afc00 100644
--- a/jOOQ/src/main/java/org/jooq/Row6.java
+++ b/jOOQ/src/main/java/org/jooq/Row6.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row7.java b/jOOQ/src/main/java/org/jooq/Row7.java
index 8a35f20289..88ca3c47e5 100644
--- a/jOOQ/src/main/java/org/jooq/Row7.java
+++ b/jOOQ/src/main/java/org/jooq/Row7.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row8.java b/jOOQ/src/main/java/org/jooq/Row8.java
index 47f94394f6..ce06e61ffc 100644
--- a/jOOQ/src/main/java/org/jooq/Row8.java
+++ b/jOOQ/src/main/java/org/jooq/Row8.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/Row9.java b/jOOQ/src/main/java/org/jooq/Row9.java
index 6b79d01edc..151764950b 100644
--- a/jOOQ/src/main/java/org/jooq/Row9.java
+++ b/jOOQ/src/main/java/org/jooq/Row9.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/RowN.java b/jOOQ/src/main/java/org/jooq/RowN.java
index a82dd1e73d..8f2790977d 100644
--- a/jOOQ/src/main/java/org/jooq/RowN.java
+++ b/jOOQ/src/main/java/org/jooq/RowN.java
@@ -37,7 +37,6 @@ package org.jooq;
 
 import org.jooq.Comparator;
 import org.jooq.api.annotation.State;
-import org.jooq.api.annotation.Transition;
 
 import java.util.Collection;