diff --git a/jOOQ/src/main/java/org/jooq/Function1.java b/jOOQ/src/main/java/org/jooq/Function1.java
index 0b1824b915..c5b01357b9 100644
--- a/jOOQ/src/main/java/org/jooq/Function1.java
+++ b/jOOQ/src/main/java/org/jooq/Function1.java
@@ -41,13 +41,9 @@ import java.util.function.Function;
/**
* A function of degree 1.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function1 extends Function {
diff --git a/jOOQ/src/main/java/org/jooq/Function10.java b/jOOQ/src/main/java/org/jooq/Function10.java
index 77506c69ab..d00cec756a 100644
--- a/jOOQ/src/main/java/org/jooq/Function10.java
+++ b/jOOQ/src/main/java/org/jooq/Function10.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 10.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function10 {
diff --git a/jOOQ/src/main/java/org/jooq/Function11.java b/jOOQ/src/main/java/org/jooq/Function11.java
index 8bc25cfc40..787fc63a06 100644
--- a/jOOQ/src/main/java/org/jooq/Function11.java
+++ b/jOOQ/src/main/java/org/jooq/Function11.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 11.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function11 {
diff --git a/jOOQ/src/main/java/org/jooq/Function12.java b/jOOQ/src/main/java/org/jooq/Function12.java
index deded23bc0..94ed740ad4 100644
--- a/jOOQ/src/main/java/org/jooq/Function12.java
+++ b/jOOQ/src/main/java/org/jooq/Function12.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 12.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function12 {
diff --git a/jOOQ/src/main/java/org/jooq/Function13.java b/jOOQ/src/main/java/org/jooq/Function13.java
index e42a2cea21..3caef36c2a 100644
--- a/jOOQ/src/main/java/org/jooq/Function13.java
+++ b/jOOQ/src/main/java/org/jooq/Function13.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 13.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function13 {
diff --git a/jOOQ/src/main/java/org/jooq/Function14.java b/jOOQ/src/main/java/org/jooq/Function14.java
index a40473f44b..4a2b710b30 100644
--- a/jOOQ/src/main/java/org/jooq/Function14.java
+++ b/jOOQ/src/main/java/org/jooq/Function14.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 14.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function14 {
diff --git a/jOOQ/src/main/java/org/jooq/Function15.java b/jOOQ/src/main/java/org/jooq/Function15.java
index 41a9b2098c..f390de63df 100644
--- a/jOOQ/src/main/java/org/jooq/Function15.java
+++ b/jOOQ/src/main/java/org/jooq/Function15.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 15.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function15 {
diff --git a/jOOQ/src/main/java/org/jooq/Function16.java b/jOOQ/src/main/java/org/jooq/Function16.java
index a514fb368c..9bfd6eab1c 100644
--- a/jOOQ/src/main/java/org/jooq/Function16.java
+++ b/jOOQ/src/main/java/org/jooq/Function16.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 16.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function16 {
diff --git a/jOOQ/src/main/java/org/jooq/Function17.java b/jOOQ/src/main/java/org/jooq/Function17.java
index c48f51577b..fa0c86bfb9 100644
--- a/jOOQ/src/main/java/org/jooq/Function17.java
+++ b/jOOQ/src/main/java/org/jooq/Function17.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 17.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function17 {
diff --git a/jOOQ/src/main/java/org/jooq/Function18.java b/jOOQ/src/main/java/org/jooq/Function18.java
index ad91df4932..bc465b477c 100644
--- a/jOOQ/src/main/java/org/jooq/Function18.java
+++ b/jOOQ/src/main/java/org/jooq/Function18.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 18.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function18 {
diff --git a/jOOQ/src/main/java/org/jooq/Function19.java b/jOOQ/src/main/java/org/jooq/Function19.java
index 76d062ea20..0d04a4a9d4 100644
--- a/jOOQ/src/main/java/org/jooq/Function19.java
+++ b/jOOQ/src/main/java/org/jooq/Function19.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 19.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function19 {
diff --git a/jOOQ/src/main/java/org/jooq/Function2.java b/jOOQ/src/main/java/org/jooq/Function2.java
index df098e9c10..d0ca26899e 100644
--- a/jOOQ/src/main/java/org/jooq/Function2.java
+++ b/jOOQ/src/main/java/org/jooq/Function2.java
@@ -41,13 +41,9 @@ import java.util.function.BiFunction;
/**
* A function of degree 2.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function2 extends BiFunction {
diff --git a/jOOQ/src/main/java/org/jooq/Function20.java b/jOOQ/src/main/java/org/jooq/Function20.java
index c2de2fe685..5e6b66ed3f 100644
--- a/jOOQ/src/main/java/org/jooq/Function20.java
+++ b/jOOQ/src/main/java/org/jooq/Function20.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 20.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function20 {
diff --git a/jOOQ/src/main/java/org/jooq/Function21.java b/jOOQ/src/main/java/org/jooq/Function21.java
index e282e6da69..af921231ee 100644
--- a/jOOQ/src/main/java/org/jooq/Function21.java
+++ b/jOOQ/src/main/java/org/jooq/Function21.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 21.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function21 {
diff --git a/jOOQ/src/main/java/org/jooq/Function22.java b/jOOQ/src/main/java/org/jooq/Function22.java
index ff83254f49..f5e6b33cc4 100644
--- a/jOOQ/src/main/java/org/jooq/Function22.java
+++ b/jOOQ/src/main/java/org/jooq/Function22.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 22.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function22 {
diff --git a/jOOQ/src/main/java/org/jooq/Function3.java b/jOOQ/src/main/java/org/jooq/Function3.java
index a22802cbc7..2e60e7b99b 100644
--- a/jOOQ/src/main/java/org/jooq/Function3.java
+++ b/jOOQ/src/main/java/org/jooq/Function3.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 3.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function3 {
diff --git a/jOOQ/src/main/java/org/jooq/Function4.java b/jOOQ/src/main/java/org/jooq/Function4.java
index 639021a207..af994f83c7 100644
--- a/jOOQ/src/main/java/org/jooq/Function4.java
+++ b/jOOQ/src/main/java/org/jooq/Function4.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 4.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function4 {
diff --git a/jOOQ/src/main/java/org/jooq/Function5.java b/jOOQ/src/main/java/org/jooq/Function5.java
index b49778656b..288d2dcac0 100644
--- a/jOOQ/src/main/java/org/jooq/Function5.java
+++ b/jOOQ/src/main/java/org/jooq/Function5.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 5.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function5 {
diff --git a/jOOQ/src/main/java/org/jooq/Function6.java b/jOOQ/src/main/java/org/jooq/Function6.java
index 85a28a67db..a9fc79c86d 100644
--- a/jOOQ/src/main/java/org/jooq/Function6.java
+++ b/jOOQ/src/main/java/org/jooq/Function6.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 6.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function6 {
diff --git a/jOOQ/src/main/java/org/jooq/Function7.java b/jOOQ/src/main/java/org/jooq/Function7.java
index a35fd504be..c9610088d3 100644
--- a/jOOQ/src/main/java/org/jooq/Function7.java
+++ b/jOOQ/src/main/java/org/jooq/Function7.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 7.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function7 {
diff --git a/jOOQ/src/main/java/org/jooq/Function8.java b/jOOQ/src/main/java/org/jooq/Function8.java
index e6253ade2d..a1b7fa4fe7 100644
--- a/jOOQ/src/main/java/org/jooq/Function8.java
+++ b/jOOQ/src/main/java/org/jooq/Function8.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 8.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function8 {
diff --git a/jOOQ/src/main/java/org/jooq/Function9.java b/jOOQ/src/main/java/org/jooq/Function9.java
index 5c9aaf75f2..98549985e0 100644
--- a/jOOQ/src/main/java/org/jooq/Function9.java
+++ b/jOOQ/src/main/java/org/jooq/Function9.java
@@ -39,13 +39,9 @@ package org.jooq;
/**
* A function of degree 9.
- *
- * This is EXPERIMENTAL API. Future jOOQ versions may instead use the
- * functional interfaces from jOOλ, and remove these types again.
*
* @author Lukas Eder
*/
-@Internal
@FunctionalInterface
public interface Function9 {