diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 2e99cf3377..f561b94b63 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -27531,72 +27531,6 @@ public class DSL {
         return new Values<Record>(rows).as("v", columns);
     }
 
-    /**
-     * Create a <code>VALUES()</code> expression of degree <code>1</code>.
-     * <p>
-     * The <code>VALUES()</code> constructor is a tool supported by some
-     * databases to allow for constructing tables from constant values.
-     * <p>
-     * If a database doesn't support the <code>VALUES()</code> constructor, it
-     * can be emulated using <code>SELECT .. UNION ALL ..</code>. The following
-     * expressions are equivalent:
-     * <p>
-     * <pre><code>
-     * -- Using VALUES() constructor
-     * VALUES(val1_1),
-     *       (val2_1),
-     *       (val3_1)
-     * AS "v"("c1"  )
-     *
-     * -- Using UNION ALL
-     * SELECT val1_1 AS "c1") UNION ALL
-     * SELECT val1_1 AS "c1") UNION ALL
-     * SELECT val1_1 AS "c1")
-     * </code></pre>
-     * <p>
-     * Use {@link Table#as(String, String...)} to rename the resulting table and
-     * its columns.
-     */
-    @SafeVarargs
-    @NotNull
-    @Support
-    public static <T> Table<Record1<T>> values(T... values) {
-        return values(Tools.<T, Row1<T>>map(values, t -> row(t), Row1[]::new));
-    }
-
-    /**
-     * Create a <code>VALUES()</code> expression of degree <code>1</code>.
-     * <p>
-     * The <code>VALUES()</code> constructor is a tool supported by some
-     * databases to allow for constructing tables from constant values.
-     * <p>
-     * If a database doesn't support the <code>VALUES()</code> constructor, it
-     * can be emulated using <code>SELECT .. UNION ALL ..</code>. The following
-     * expressions are equivalent:
-     * <p>
-     * <pre><code>
-     * -- Using VALUES() constructor
-     * VALUES(val1_1),
-     *       (val2_1),
-     *       (val3_1)
-     * AS "v"("c1"  )
-     *
-     * -- Using UNION ALL
-     * SELECT val1_1 AS "c1") UNION ALL
-     * SELECT val1_1 AS "c1") UNION ALL
-     * SELECT val1_1 AS "c1")
-     * </code></pre>
-     * <p>
-     * Use {@link Table#as(String, String...)} to rename the resulting table and
-     * its columns.
-     */
-    @SafeVarargs
-    @NotNull
-    @Support
-    public static <T> Table<Record1<T>> values(Field<T>... values) {
-        return values(Tools.<Field<T>, Row1<T>>map(values, f -> row(f), Row1[]::new));
-    }
-
 
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index af3884cc65..708f26c344 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -3213,7 +3213,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
                 // [#7222] Workaround for https://issues.apache.org/jira/browse/DERBY-6983
                 if (ctx.family() == DERBY)
-                    ctx.visit(new SelectFieldList<Field<?>>(mapToList(fields, Tools::unqualified)));
+                    ctx.visit(new SelectFieldList<>(mapToList(fields, f -> Tools.unqualified(f))));
                 else
                     ctx.sql('*');