diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/db2/library.xml b/jOOQ-test/configuration/org/jooq/configuration/espen/db2/library.xml
deleted file mode 100644
index af3e74b129..0000000000
--- a/jOOQ-test/configuration/org/jooq/configuration/espen/db2/library.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<configuration xmlns="http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd">
-    <jdbc>
-        <driver>com.ibm.db2.jcc.DB2Driver</driver>
-        <url>jdbc:db2://localhost:50001/cntest:retrieveMessagesFromServerOnGetMessage=true;</url>
-        <schema>LUKAS</schema>
-        <user>mcdba</user>
-        <password>con007</password>
-    </jdbc>
-    <generator>
-        <name>org.jooq.util.DefaultGenerator</name>
-        <database>
-            <name>org.jooq.util.db2.DB2Database</name>
-            <includes>T_.*|X_.*|V_.*|P_.*|F_.*|(F|P)[0-9]+|S_.*</includes>
-            <excludes>T_BOOK_DETAILS</excludes>
-            <dateAsTimestamp>false</dateAsTimestamp>
-            <unsignedTypes>true</unsignedTypes>
-
-            <customTypes>
-                <customType>
-            		<name>org.jooq.test._.converters.Boolean_10</name>
-            		<converter>org.jooq.test._.converters.Boolean_10_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_TF_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_TF_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_TF_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_TF_UC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YN_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YN_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YN_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YN_UC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YES_NO_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YES_NO_UC_Converter</converter>
-            	</customType>
-            </customTypes>
-
-            <forcedTypes>
-                <forcedType>
-                    <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
-                </forcedType>
-
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
-                </forcedType>
-            </forcedTypes>
-        </database>
-        <generate>
-            <relations>true</relations>
-            <navigationMethods>true</navigationMethods>
-            <deprecated>true</deprecated>
-            <instanceFields>false</instanceFields>
-            <generatedAnnotation>false</generatedAnnotation>
-            <records>true</records>
-            <pojos>false</pojos>
-            <jpaAnnotations>false</jpaAnnotations>
-        </generate>
-        <target>
-            <packageName>org.jooq.test.db2.generatedclasses</packageName>
-            <directory>./src</directory>
-        </target>
-    </generator>
-</configuration>
\ No newline at end of file
diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/h2/library.xml b/jOOQ-test/configuration/org/jooq/configuration/espen/h2/library.xml
deleted file mode 100644
index 2f3d1705b8..0000000000
--- a/jOOQ-test/configuration/org/jooq/configuration/espen/h2/library.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<configuration xmlns="http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd">
-    <jdbc>
-        <driver>org.h2.Driver</driver>
-        <url>jdbc:h2:~/test</url>
-        <schema>PUBLIC</schema>
-        <user>sa</user>
-        <password></password>
-    </jdbc>
-    <generator>
-        <name>org.jooq.util.DefaultGenerator</name>
-        <database>
-            <name>org.jooq.util.h2.H2Database</name>
-            <includes>.*</includes>
-            <excludes>T_BOOK_DETAILS|SYSTEM_SEQUENCE.*</excludes>
-            <dateAsTimestamp>false</dateAsTimestamp>
-            <unsignedTypes>true</unsignedTypes>
-
-            <customTypes>
-                <customType>
-            		<name>org.jooq.test._.converters.Boolean_10</name>
-            		<converter>org.jooq.test._.converters.Boolean_10_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_TF_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_TF_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_TF_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_TF_UC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YN_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YN_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YN_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YN_UC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YES_NO_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YES_NO_UC_Converter</converter>
-            	</customType>
-            </customTypes>
-
-            <forcedTypes>
-                <forcedType>
-                    <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
-                </forcedType>
-
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
-                </forcedType>
-            </forcedTypes>
-        </database>
-        <generate>
-            <relations>true</relations>
-            <navigationMethods>true</navigationMethods>
-            <deprecated>true</deprecated>
-            <instanceFields>false</instanceFields>
-            <generatedAnnotation>false</generatedAnnotation>
-            <records>true</records>
-            <pojos>false</pojos>
-            <jpaAnnotations>false</jpaAnnotations>
-        </generate>
-        <target>
-            <packageName>org.jooq.test.h2.generatedclasses</packageName>
-            <directory>./src</directory>
-        </target>
-    </generator>
-</configuration>
\ No newline at end of file
diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/library.xml b/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/library.xml
deleted file mode 100644
index 69051a5ca0..0000000000
--- a/jOOQ-test/configuration/org/jooq/configuration/espen/hsqldb/library.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<configuration xmlns="http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd">
-    <jdbc>
-        <driver>org.hsqldb.jdbcDriver</driver>
-        <url>jdbc:hsqldb:hsql://localhost</url>
-        <schema>PUBLIC</schema>
-        <user>sa</user>
-        <password></password>
-    </jdbc>
-    <generator>
-        <name>org.jooq.util.DefaultGenerator</name>
-        <database>
-            <name>org.jooq.util.hsqldb.HSQLDBDatabase</name>
-            <includes>.*</includes>
-            <excludes>T_BOOK_DETAILS|S_TRIGGERS_SEQUENCE</excludes>
-            <dateAsTimestamp>false</dateAsTimestamp>
-            <unsignedTypes>true</unsignedTypes>
-            <customTypes>
-            	<customType>
-            		<name>org.jooq.test._.converters.StringEnum</name>
-            		<converter>org.jooq.test._.converters.StringEnumConverter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.StringEnum1</name>
-            		<converter>org.jooq.test._.converters.StringEnum1Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.OrdinalEnum</name>
-            		<converter>org.jooq.test._.converters.OrdinalEnumConverter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.OrdinalEnum1</name>
-            		<converter>org.jooq.test._.converters.OrdinalEnum1Converter</converter>
-            	</customType>
-
-            	<customType>
-            		<name>java.util.Date</name>
-            		<converter>org.jooq.test._.converters.DateConverter</converter>
-            	</customType>
-            	<customType>
-            		<name>java.util.GregorianCalendar</name>
-            		<converter>org.jooq.test._.converters.CalendarConverter</converter>
-            	</customType>
-
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_10</name>
-            		<converter>org.jooq.test._.converters.Boolean_10_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_TF_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_TF_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_TF_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_TF_UC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YN_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YN_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YN_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YN_UC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YES_NO_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YES_NO_UC_Converter</converter>
-            	</customType>
-            </customTypes>
-
-            <forcedTypes>
-                <forcedType>
-                	<name>org.jooq.test._.converters.StringEnum</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_NAME)</expressions>
-                </forcedType>
-                <forcedType>
-                	<name>org.jooq.test._.converters.StringEnum1</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_TEXT)</expressions>
-                </forcedType>
-                <forcedType>
-                	<name>org.jooq.test._.converters.OrdinalEnum</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL)</expressions>
-                </forcedType>
-                <forcedType>
-                	<name>org.jooq.test._.converters.OrdinalEnum1</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC)</expressions>
-                </forcedType>
-                <forcedType>
-                	<name>java.util.Date</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_DATE)</expressions>
-                </forcedType>
-                <forcedType>
-                	<name>java.util.GregorianCalendar</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_CALENDAR)</expressions>
-                </forcedType>
-
-                <forcedType>
-                    <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
-                </forcedType>
-
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
-                </forcedType>
-            </forcedTypes>
-        </database>
-        <generate>
-            <relations>true</relations>
-            <navigationMethods>true</navigationMethods>
-            <deprecated>true</deprecated>
-            <instanceFields>true</instanceFields>
-            <generatedAnnotation>true</generatedAnnotation>
-            <records>true</records>
-            <pojos>false</pojos>
-            <jpaAnnotations>false</jpaAnnotations>
-        </generate>
-        <target>
-            <packageName>org.jooq.test.hsqldb.generatedclasses</packageName>
-            <directory>./src</directory>
-        </target>
-    </generator>
-</configuration>
\ No newline at end of file
diff --git a/jOOQ-test/configuration/org/jooq/configuration/espen/sybase/library.xml b/jOOQ-test/configuration/org/jooq/configuration/espen/sybase/library.xml
deleted file mode 100644
index f39b14fbaf..0000000000
--- a/jOOQ-test/configuration/org/jooq/configuration/espen/sybase/library.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<configuration>
-    <jdbc>
-        <driver>com.sybase.jdbc3.jdbc.SybDriver</driver>
-        <url>jdbc:sybase:Tds:localhost:2638</url>
-        <schema>dba</schema>
-        <user>dba</user>
-        <password>sql</password>
-    </jdbc>
-    <generator>
-        <name>org.jooq.util.DefaultGenerator</name>
-        <strategy/>
-        <database>
-            <name>org.jooq.util.sybase.SybaseDatabase</name>
-            <includes>t_.*|x_.*|v_.*|V_.*|p_.*|f_.*|(f|p)[0-9]+|s_.*</includes>
-            <excludes>t_book_details</excludes>
-            <dateAsTimestamp>false</dateAsTimestamp>
-            <customTypes>
-                <customType>
-            		<name>org.jooq.test._.converters.Boolean_10</name>
-            		<converter>org.jooq.test._.converters.Boolean_10_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_TF_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_TF_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_TF_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_TF_UC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YN_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YN_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YN_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YN_UC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YES_NO_LC_Converter</converter>
-            	</customType>
-            	<customType>
-            		<name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-            		<converter>org.jooq.test._.converters.Boolean_YES_NO_UC_Converter</converter>
-            	</customType>
-            </customTypes>
-
-            <forcedTypes>
-                <forcedType>
-                    <name>BIT</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
-                </forcedType>
-
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
-                </forcedType>
-                <forcedType>
-                    <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
-                </forcedType>
-            </forcedTypes>
-        </database>
-        <generate>
-            <relations>true</relations>
-            <deprecated>true</deprecated>
-            <instanceFields>true</instanceFields>
-            <unsignedTypes>true</unsignedTypes>
-            <generatedAnnotation>false</generatedAnnotation>
-        </generate>
-        <target>
-            <packageName>org.jooq.test.sybase.generatedclasses</packageName>
-            <directory>./src</directory>
-        </target>
-    </generator>
-</configuration>