diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapForInsert.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapForInsert.java
deleted file mode 100644
index 6e5781a5bc..0000000000
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapForInsert.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Other licenses:
- * -----------------------------------------------------------------------------
- * Commercial licenses for this work are available. These replace the above
- * ASL 2.0 and offer limited warranties, support, maintenance, and commercial
- * database integrations.
- *
- * For more information, please visit: http://www.jooq.org/licenses
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
-package org.jooq.impl;
-
-import static org.jooq.Clause.FIELD_ROW;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.jooq.Clause;
-import org.jooq.Context;
-import org.jooq.Field;
-import org.jooq.impl.AbstractStoreQuery.UnknownField;
-
-/**
- * @author Lukas Eder
- */
-final class FieldMapForInsert extends AbstractQueryPartMap<Field<?>, Field<?>> {
-
-    /**
-     * Generated UID
-     */
-    private static final long     serialVersionUID = -2192833491610583485L;
-    private static final Clause[] CLAUSES          = { FIELD_ROW };
-
-    FieldMapForInsert() {
-    }
-
-    @Override
-    public final void accept(Context<?> ctx) {
-        boolean indent = (size() > 1);
-
-        ctx.sql('(');
-
-        if (indent)
-            ctx.formatIndentStart();
-
-        String separator = "";
-        for (Field<?> field : values()) {
-            ctx.sql(separator);
-
-            if (indent)
-                ctx.formatNewLine();
-
-            ctx.visit(field);
-            separator = ", ";
-        }
-
-        if (indent)
-            ctx.formatIndentEnd()
-               .formatNewLine();
-
-        ctx.sql(')');
-    }
-
-    final void toSQLReferenceKeys(Context<?> ctx) {
-
-        // [#2995] Do not generate empty column lists.
-        if (size() == 0)
-            return;
-
-        // [#4629] Do not generate column lists for unknown columns
-        unknownFields: {
-            for (Field<?> field : keySet())
-                if (!(field instanceof UnknownField))
-                    break unknownFields;
-
-            return;
-        }
-
-        boolean indent = (size() > 1);
-
-        ctx.sql(" (");
-
-        if (indent)
-            ctx.formatIndentStart();
-
-        // [#989] Avoid qualifying fields in INSERT field declaration
-        boolean qualify = ctx.qualify();
-        ctx.qualify(false);
-
-        String separator = "";
-        for (Field<?> field : keySet()) {
-            ctx.sql(separator);
-
-            if (indent)
-                ctx.formatNewLine();
-
-            ctx.visit(field);
-            separator = ", ";
-        }
-
-        ctx.qualify(qualify);
-
-        if (indent)
-            ctx.formatIndentEnd()
-               .formatNewLine();
-
-        ctx.sql(')');
-    }
-
-    @Override
-    public final Clause[] clauses(Context<?> ctx) {
-        return CLAUSES;
-    }
-
-    final void putFields(Collection<? extends Field<?>> fields) {
-        for (Field<?> field : fields)
-            put(field, null);
-    }
-
-    final void putValues(Collection<? extends Field<?>> values) {
-        if (values.size() != size())
-            throw new IllegalArgumentException("The number of values must match the number of fields: " + this);
-
-        Iterator<? extends Field<?>> it = values.iterator();
-        for (Entry<Field<?>, Field<?>> entry : entrySet())
-            entry.setValue(it.next());
-    }
-
-    final void set(Map<? extends Field<?>, ?> map) {
-        for (Entry<? extends Field<?>, ?> entry : map.entrySet()) {
-            Field<?> field = entry.getKey();
-            Object value = entry.getValue();
-
-            put(entry.getKey(), Tools.field(value, field));
-        }
-    }
-}