diff --git a/README.md b/README.md
index dc7e43a..cc23eb6 100644
--- a/README.md
+++ b/README.md
@@ -103,8 +103,8 @@ dependencies to the deployment.
 Note that `@DefaultDeployment` only adds classes in the current package. Place your tests in
 a package that includes all dependencies.
 
-The file [`project-testing.yml`](myapp/src/test/resources/project-testing.yml) contains configuration
-required for testing, in particular an H2 datasource. In Thorntail 4, this file can be removed
+The file [`project-stages.yml`](myapp/src/test/resources/project-stages.yml) contains configuration
+required for testing, in particular an H2 datasource. In Thorntail 4, this file may be removed
 and replaced with profiles that are activated through the `thorntail.profiles` property.
 
 ## Running Arquillian tests from the IDE
diff --git a/myapp/src/main/resources/modules/com/h2database/h2/main/module.xml b/myapp/src/main/resources/modules/com/h2database/h2/main/module.xml
deleted file mode 100644
index d96d217..0000000
--- a/myapp/src/main/resources/modules/com/h2database/h2/main/module.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.3" name="com.h2database.h2">
-    <resources>
-        <artifact name="com.h2database:h2:${h2.version}"/>
-    </resources>
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="javax.transaction.api"/>
-        <module name="javax.servlet.api" optional="true"/>
-    </dependencies>
-</module>
diff --git a/myapp/src/main/resources/modules/com/mysql/main/module.xml b/myapp/src/main/resources/modules/com/mysql/main/module.xml
deleted file mode 100644
index 6d308df..0000000
--- a/myapp/src/main/resources/modules/com/mysql/main/module.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.3" name="com.mysql">
-    <resources>
-        <artifact name="mysql:mysql-connector-java:${mysql.version}"/>
-    </resources>
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="javax.transaction.api"/>
-    </dependencies>
-</module>
diff --git a/myapp/src/main/resources/modules/com/oracle/main/module.xml b/myapp/src/main/resources/modules/com/oracle/main/module.xml
deleted file mode 100644
index 35ce239..0000000
--- a/myapp/src/main/resources/modules/com/oracle/main/module.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<module xmlns="urn:jboss:module:1.3" name="com.oracle">
-    <resources>
-        <artifact name="com.oracle.jdbc:ojdbc8:${ojdbc8.version}"/>
-    </resources>
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="javax.transaction.api"/>
-    </dependencies>
-</module>
\ No newline at end of file
diff --git a/myapp/src/main/resources/modules/org/postgresql/main/module.xml b/myapp/src/main/resources/modules/org/postgresql/main/module.xml
deleted file mode 100644
index 883142a..0000000
--- a/myapp/src/main/resources/modules/org/postgresql/main/module.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<module xmlns="urn:jboss:module:1.3" name="org.postgresql">
-    <resources>
-        <artifact name="org.postgresql:postgresql:${postgresql.version}"/>
-    </resources>
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="javax.transaction.api"/>
-    </dependencies>
-</module>
\ No newline at end of file
diff --git a/myapp/src/main/resources/project-h2.yml b/myapp/src/main/resources/project-h2.yml
index e56533f..924ce99 100644
--- a/myapp/src/main/resources/project-h2.yml
+++ b/myapp/src/main/resources/project-h2.yml
@@ -7,11 +7,5 @@ thorntail:
         user-name: sa
         password: sa
 
-    jdbc-drivers:
-      h2:
-        driver-class-name: org.h2.Driver
-        xa-datasource-class-name: org.h2.jdbcx.JdbcDataSource
-        driver-module-name: com.h2database.h2
-
 flyway:
   locations: classpath:db/migration/h2
\ No newline at end of file
diff --git a/myapp/src/main/resources/project-mysql.yml b/myapp/src/main/resources/project-mysql.yml
index 0fc9cdc..0d58955 100644
--- a/myapp/src/main/resources/project-mysql.yml
+++ b/myapp/src/main/resources/project-mysql.yml
@@ -11,11 +11,5 @@ thorntail:
         background-validation: false
         exception-sorter-class-name: org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter
 
-    jdbc-drivers:
-      mysql:
-        driver-class-name: com.mysql.jdbc.Driver
-        xa-datasource-class-name: com.mysql.jdbc.jdbc2.optional.MysqlXADataSource
-        driver-module-name: com.mysql
-
 flyway:
   locations: classpath:db/migration/mysql
\ No newline at end of file
diff --git a/myapp/src/main/resources/project-oracle.yml b/myapp/src/main/resources/project-oracle.yml
index eacfa89..43bf760 100644
--- a/myapp/src/main/resources/project-oracle.yml
+++ b/myapp/src/main/resources/project-oracle.yml
@@ -12,11 +12,5 @@ thorntail:
         stale-connection-checker-class-name: org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker
         exception-sorter-class-name: org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter
 
-    jdbc-drivers:
-      oracle:
-        driver-class-name: oracle.jdbc.OracleDriver
-        xa-datasource-class: oracle.jdbc.xa.client.OracleXADataSource
-        driver-module-name: com.oracle
-
 flyway:
   locations: classpath:db/migration/oracle
\ No newline at end of file
diff --git a/myapp/src/main/resources/project-postgresql.yml b/myapp/src/main/resources/project-postgresql.yml
index 265db01..d24cedd 100644
--- a/myapp/src/main/resources/project-postgresql.yml
+++ b/myapp/src/main/resources/project-postgresql.yml
@@ -11,11 +11,5 @@ thorntail:
         background-validation: false
         exception-sorter-class-name: org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter
 
-    jdbc-drivers:
-      postgresql:
-        driver-class-name: org.postgresql.Driver
-        xa-datasource-class: org.postgresql.xa.PGXADataSource
-        driver-module-name: org.postgresql
-
 flyway:
   locations: classpath:db/migration/postgresql
\ No newline at end of file
diff --git a/myapp/src/test/resources/project-stages.yml b/myapp/src/test/resources/project-stages.yml
index fcb1273..5cd4d24 100644
--- a/myapp/src/test/resources/project-stages.yml
+++ b/myapp/src/test/resources/project-stages.yml
@@ -5,15 +5,9 @@ thorntail:
         level: DEBUG
 
   datasources:
-    jdbc-drivers:
-      h2testing:
-        driver-class-name: org.h2.Driver
-        xa-datasource-class-name: org.h2.jdbcx.JdbcDataSource
-        driver-module-name: com.h2database.h2
-
     data-sources:
       MyDS:
-        driver-name: h2testing
+        driver-name: h2
         connection-url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
         user-name: sa
         password: sa