diff --git a/jOOQ/src/main/java/org/jooq/DeleteQuery.java b/jOOQ/src/main/java/org/jooq/DeleteQuery.java
index fc30b6e6bb..659571717d 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteQuery.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteQuery.java
@@ -65,44 +65,26 @@ public interface DeleteQuery<R extends Record> extends ConditionProvider, Delete
     // Methods from ConditionProvider, OrderProvider, LockProvider
     // ------------------------------------------------------------------------
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Condition condition);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Condition... conditions);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Collection<? extends Condition> conditions);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Operator operator, Condition condition);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Operator operator, Condition... conditions);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Operator operator, Collection<? extends Condition> conditions);
diff --git a/jOOQ/src/main/java/org/jooq/EmbeddableRecord.java b/jOOQ/src/main/java/org/jooq/EmbeddableRecord.java
index 8a9e5a4443..feef937944 100644
--- a/jOOQ/src/main/java/org/jooq/EmbeddableRecord.java
+++ b/jOOQ/src/main/java/org/jooq/EmbeddableRecord.java
@@ -45,21 +45,12 @@ package org.jooq;
  */
 public interface EmbeddableRecord<R extends EmbeddableRecord<R>> extends Record {
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     R original();
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     <T> R with(Field<T> field, T value);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     <T, U> R with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 }
diff --git a/jOOQ/src/main/java/org/jooq/Name.java b/jOOQ/src/main/java/org/jooq/Name.java
index 2c81901cca..5c93972404 100644
--- a/jOOQ/src/main/java/org/jooq/Name.java
+++ b/jOOQ/src/main/java/org/jooq/Name.java
@@ -764,9 +764,6 @@ public interface Name extends QueryPart {
 
 // [jooq-tools] END [fields]
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     boolean equals(Object other);
 
diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java
index 4770955e75..3f61183b94 100644
--- a/jOOQ/src/main/java/org/jooq/ResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java
@@ -3746,15 +3746,9 @@ extends
      */
     Class<? extends R> getRecordType();
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     ResultQuery<R> bind(String param, Object value) throws IllegalArgumentException, DataTypeException;
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     ResultQuery<R> bind(int index, Object value) throws IllegalArgumentException, DataTypeException;
 
@@ -3762,21 +3756,12 @@ extends
     // JDBC methods
     // ------------------------------------------------------------------------
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     ResultQuery<R> poolable(boolean poolable);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     ResultQuery<R> queryTimeout(int timeout);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     ResultQuery<R> keepStatement(boolean keepStatement);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectQuery.java b/jOOQ/src/main/java/org/jooq/SelectQuery.java
index 7cca72c379..0d55ccae4d 100644
--- a/jOOQ/src/main/java/org/jooq/SelectQuery.java
+++ b/jOOQ/src/main/java/org/jooq/SelectQuery.java
@@ -542,44 +542,26 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
     // Methods from ConditionProvider, OrderProvider, LockProvider
     // ------------------------------------------------------------------------
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Condition condition);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Condition... conditions);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Collection<? extends Condition> conditions);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Operator operator, Condition condition);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Operator operator, Condition... conditions);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Operator operator, Collection<? extends Condition> conditions);
diff --git a/jOOQ/src/main/java/org/jooq/TableRecord.java b/jOOQ/src/main/java/org/jooq/TableRecord.java
index e2d71fa2cb..b85ab33983 100644
--- a/jOOQ/src/main/java/org/jooq/TableRecord.java
+++ b/jOOQ/src/main/java/org/jooq/TableRecord.java
@@ -54,9 +54,6 @@ public interface TableRecord<R extends TableRecord<R>> extends Record {
      */
     Table<R> getTable();
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     R original();
 
@@ -111,15 +108,9 @@ public interface TableRecord<R extends TableRecord<R>> extends Record {
      */
     <O extends UpdatableRecord<O>> O fetchParent(ForeignKey<R, O> key) throws DataAccessException;
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     <T> R with(Field<T> field, T value);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     <T, U> R with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 }
diff --git a/jOOQ/src/main/java/org/jooq/UDTRecord.java b/jOOQ/src/main/java/org/jooq/UDTRecord.java
index 9c6712d4ce..1ed05dd55d 100644
--- a/jOOQ/src/main/java/org/jooq/UDTRecord.java
+++ b/jOOQ/src/main/java/org/jooq/UDTRecord.java
@@ -52,15 +52,9 @@ public interface UDTRecord<R extends UDTRecord<R>> extends Record, SQLData {
      */
     UDT<R> getUDT();
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     <T> R with(Field<T> field, T value);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     <T, U> R with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
diff --git a/jOOQ/src/main/java/org/jooq/UpdateQuery.java b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
index ec07908686..f038459901 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateQuery.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
@@ -376,44 +376,26 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
     // XXX: Methods from ConditionProvider
     // ------------------------------------------------------------------------
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Condition condition);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Condition... conditions);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Collection<? extends Condition> conditions);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Operator operator, Condition condition);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Operator operator, Condition... conditions);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Support
     void addConditions(Operator operator, Collection<? extends Condition> conditions);
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
index e1670e3a64..245aa8d12b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
@@ -567,17 +567,11 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query {
 
 
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final String getSQL() {
         return getSQL(getParamType(Tools.settings(configuration())));
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final String getSQL(ParamType paramType) {
         switch (paramType) {
@@ -596,9 +590,6 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query {
         throw new IllegalArgumentException("ParamType not supported: " + paramType);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     @Deprecated
     public final String getSQL(boolean inline) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsListenerProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsListenerProvider.java
index d64a69a69f..f1bbf90324 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsListenerProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsListenerProvider.java
@@ -85,17 +85,11 @@ public class DefaultDiagnosticsListenerProvider implements DiagnosticsListenerPr
         this.listener = listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final DiagnosticsListener provide() {
         return listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public String toString() {
         return listener.toString();
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultExecuteListenerProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultExecuteListenerProvider.java
index e768e31bb8..9340a7174d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultExecuteListenerProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultExecuteListenerProvider.java
@@ -85,17 +85,11 @@ public class DefaultExecuteListenerProvider implements ExecuteListenerProvider,
         this.listener = listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final ExecuteListener provide() {
         return listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public String toString() {
         return listener.toString();
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordListenerProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordListenerProvider.java
index 99749e2ceb..80bde86bbf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordListenerProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordListenerProvider.java
@@ -85,17 +85,11 @@ public class DefaultRecordListenerProvider implements RecordListenerProvider, Se
         this.listener = listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final RecordListener provide() {
         return listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public String toString() {
         return listener.toString();
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultTransactionListenerProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultTransactionListenerProvider.java
index ea1d01a463..f136222d4c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultTransactionListenerProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultTransactionListenerProvider.java
@@ -85,17 +85,11 @@ public class DefaultTransactionListenerProvider implements TransactionListenerPr
         this.listener = listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final TransactionListener provide() {
         return listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public String toString() {
         return listener.toString();
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultVisitListenerProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultVisitListenerProvider.java
index 2c5f378512..e71b36086f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultVisitListenerProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultVisitListenerProvider.java
@@ -85,17 +85,11 @@ public class DefaultVisitListenerProvider implements VisitListenerProvider, Seri
         this.listener = listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final VisitListener provide() {
         return listener;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public String toString() {
         return listener.toString();
diff --git a/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java b/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java
index f3d36581df..972e71ecc8 100644
--- a/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java
+++ b/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java
@@ -775,17 +775,11 @@ public class Reflect {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public int hashCode() {
         return object.hashCode();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Reflect) {
@@ -795,9 +789,6 @@ public class Reflect {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public String toString() {
         return String.valueOf(object);