diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java
index 7a4cfe2d69..7346913203 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QOM.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java
@@ -446,7 +446,7 @@ public final class QOM {
     // -------------------------------------------------------------------------
 
     public interface MTable<R extends Record> extends MQueryPart {}
-    public interface MTableRef<R extends Record> extends MTable<R>, MQualified {}
+    public interface MTableRef<R extends Record> extends UEmptyTable<R>, MQualified {}
     public interface MDual extends MTable<Record>, UEmpty {}
     public interface MLateral<R extends Record> extends MTable<R>, UOperator1<MTable<R>, MTable<R>> {}
     public interface MDerivedTable<R extends Record> extends MTable<R>, UOperator1<MSelect<R>, MTable<R>> {}
@@ -678,7 +678,7 @@ public final class QOM {
     }
     public interface MInline<T> extends MParam<T> {}
     public interface MVal<T> extends MParam<T> {}
-    public interface MFieldRef<T> extends MField<T>, MNamed {
+    public interface MFieldRef<T> extends UEmptyField<T>, MNamed {
         @NotNull MTableRef<?> $table();
     }
     public interface MDefault<T> extends MField<T>, UEmpty {}
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
index 87223f54ab..c599be827e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
@@ -133,21 +133,6 @@ class TableFieldImpl<R extends Record, T> extends AbstractField<T> implements Ta
     // XXX: Query Object Model
     // -------------------------------------------------------------------------
 
-    @Override
-    public final <X> X traverse(
-        X init,
-        Predicate<? super X> abort,
-        Predicate<? super MQueryPart> recurse,
-        BiFunction<? super X, ? super MQueryPart, ? extends X> accumulate
-    ) {
-        return QOM.traverse(init, abort, recurse, accumulate, this, table);
-    }
-
-    @Override
-    public final MQueryPart replace(Function1<? super MQueryPart, ? extends MQueryPart> replacement) {
-        return QOM.replace(this, table, t -> new TableFieldImpl<R, T>(getQualifiedName(), getDataType(), t, getCommentPart(), getBinding()), replacement);
-    }
-
     @Override
     public final MTableRef<?> $table() {
         return (MTableRef<?>) table;