diff --git a/src/Frank2Transactions/XA/docker-compose.yml b/src/Frank2Transactions/XA/docker-compose.yml
deleted file mode 100644
index 4ceae7f2..00000000
--- a/src/Frank2Transactions/XA/docker-compose.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-services:
-  db:
-    image: private.docker.nexus.frankframework.org/ff-test/dbms/postgresql
-    ports:
-      - 5432:5432
-  jms:
-    image: private.docker.nexus.frankframework.org/ff-test/mq/artemis
-    ports:
-      - 8160:8160
-      - 61615:61615
-  ff:
-    image: frankframework/frankframework:8.3.0-SNAPSHOT
-    ports:
-      - 8080:8080
-    volumes:
-      - ./src/main/resources:/opt/frank/resources
-    environment:
-      jdbc.dbms.default: postgres-xa
-      jdbc.hostname: db
-      jms.hostname: jms
-      transactionmanager.type.default: NARAYANA
-      jms.createDestination: true
diff --git a/src/Frank2Transactions/XA/src/main/resources/Configuration.xml b/src/Frank2Transactions/XA/src/main/resources/Configuration.xml
deleted file mode 100644
index a8127dac..00000000
--- a/src/Frank2Transactions/XA/src/main/resources/Configuration.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Configuration
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../FrankConfig.xsd"
-    >
-    <Adapter name="writeDb">
-        <Receiver checkForDuplicates="true"
-            checkForDuplicatesMethod="CORRELATIONID" correlationIDXPath="/input/@correlationId">
-            <ApiListener uriPattern="/write" method="POST" />
-            <!-- <JdbcErrorStorage slotId="write-db"/> -->
-            <JdbcMessageLog slotId="write-db"/>
-        </Receiver>
-        <Pipeline>
-            <XmlInputValidator schema="input.xsd" root="input" throwException="true"></XmlInputValidator>
-            <XsltPipe name="extractMessage" xpathExpression="/input/@message"></XsltPipe>
-            <PutInSessionPipe name="Safe message">
-                <Param name="inputMessage" />
-            </PutInSessionPipe>
-            <SenderPipe name="writeTableMessage" getInputFromSessionKey="inputMessage">
-                <IbisLocalSender name="writeTableMessage" javaListener="writeTableMessage" />
-            </SenderPipe>
-            <EchoPipe name="originalMessage" getInputFromSessionKey="inputMessage" />
-            <SenderPipe name="writeTableOtherMessage">
-                <IbisLocalSender name="writeTableOtherMessage" javaListener="writeTableOtherMessage" />
-            </SenderPipe>
-        </Pipeline>
-    </Adapter>
-    <Adapter name="writeTableMessage">
-        <Receiver>
-            <JavaListener name="writeTableMessage" serviceName="writeTableMessage" />
-        </Receiver>
-        <Pipeline>
-            <SenderPipe name="writeTableMessage">
-                <FixedQuerySender query="INSERT INTO &quot;message&quot;(message) VALUES(?)">
-                    <Param name="message" type="string" defaultValueMethods="input" />
-                </FixedQuerySender>
-            </SenderPipe>
-        </Pipeline>
-    </Adapter>
-    <Adapter name="writeTableOtherMessage">
-        <Receiver>
-            <JavaListener name="writeTableOtherMessage" serviceName="writeTableOtherMessage" />
-        </Receiver>
-        <Pipeline>
-            <SenderPipe name="writeTableOtherMessage">
-                <FixedQuerySender query="INSERT INTO &quot;otherMessage&quot;(message) VALUES(?)">
-                    <Param name="message" type="string" defaultValueMethods="input" />
-                </FixedQuerySender>
-            </SenderPipe>
-        </Pipeline>
-    </Adapter>
-</Configuration>
-
-<Adapter name="enqueue">
-    <Receiver>
-        <JavaListener name="enqueueListener" />
-    </Receiver>
-    <Pipeline>
-        <SenderPipe name="enqueue">
-            <JmsSender name="enqueue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis"></JmsSender>
-        </SenderPipe>
-    </Pipeline>
-</Adapter>
-<Adapter name="dequeue">
-    <Receiver>
-        <JmsListener name="dequeue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis" />
-    </Receiver>
-    <Pipeline>
-        <EchoPipe name="echoDequeued" />
-    </Pipeline>
-</Adapter>
diff --git a/src/Frank2Transactions/XA/src/main/resources/Configuration.xml.bak b/src/Frank2Transactions/XA/src/main/resources/Configuration.xml.bak
deleted file mode 100644
index 5824b349..00000000
--- a/src/Frank2Transactions/XA/src/main/resources/Configuration.xml.bak
+++ /dev/null
@@ -1,70 +0,0 @@
-<Configuration
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../FrankConfig.xsd"
-    >
-    <!-- Accessing Db and queue -->
-    <Adapter name="writeDb">
-        <!-- This is the default: transactionAttribute="Supports" -->
-        <Receiver>
-            <JavaListener name="writeDb" serviceName="writeDb" />
-        </Receiver>
-        <Pipeline>
-            <SenderPipe name="writeDb">
-                <FixedQuerySender query="INSERT INTO message(message) VALUES(?)">
-                    <Param name="message" type="string" defaultValueMethods="input" />
-                </FixedQuerySender>
-            </SenderPipe>
-        </Pipeline>
-    </Adapter>
-    <Adapter name="causeDbError">
-        <Receiver>
-            <JavaListener name="causeDbError" serviceName="causeDbError" />
-        </Receiver>
-        <Pipeline>
-            <SenderPipe name="causeDbError">
-                <FixedQuerySender query="INSERT INTO message(message) VALUES(NULL)" />
-            </SenderPipe>
-        </Pipeline>
-    </Adapter>
-    <Adapter name="enqueue">
-        <Receiver>
-            <JavaListener name="enqueueListener" />
-        </Receiver>
-        <Pipeline>
-            <SenderPipe name="enqueue">
-                <JmsSender name="enqueue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis"></JmsSender>
-            </SenderPipe>
-        </Pipeline>
-    </Adapter>
-    <Adapter name="dequeue">
-        <Receiver>
-            <JmsListener name="dequeue" destinationName="myQueue" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis" />
-        </Receiver>
-        <Pipeline>
-            <EchoPipe name="echoDequeued" />
-        </Pipeline>
-    </Adapter>
-    <Adapter name="enqueueForTransaction">
-        <Receiver>
-            <JavaListener name="enqueueListener" />
-        </Receiver>
-        <Pipeline>
-            <SenderPipe name="enqueue">
-                <JmsSender name="enqueue" destinationName="with-transaction" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis"></JmsSender>
-            </SenderPipe>
-        </Pipeline>
-    </Adapter>
-    <Adapter name="processInTransaction">
-        <Receiver transactionAttribute="RequiresNew"
-            maxRetries="5">
-            <JmsListener name="dequeue" destinationName="with-transaction" messageClass="TEXT" queueConnectionFactoryName="jms/qcf-artemis" />
-            <JdbcErrorStorage slotId="transactions" />
-        </Receiver>
-        <Pipeline>
-            <SenderPipe name="callWriteInDb">
-                <IbisLocalSender name="putInDb" javaListener="writeDb" />
-                <Forward name="success" path="READY" />
-            </SenderPipe>
-        </Pipeline>
-    </Adapter>
-</Configuration>
\ No newline at end of file
diff --git a/src/Frank2Transactions/XA/src/main/resources/DatabaseChangelog.xml b/src/Frank2Transactions/XA/src/main/resources/DatabaseChangelog.xml
deleted file mode 100644
index 9c5eb1ba..00000000
--- a/src/Frank2Transactions/XA/src/main/resources/DatabaseChangelog.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<databaseChangeLog
-        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd
-        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-    <changeSet id="1" author="martijn">
-        <createTable tableName="message">
-            <column name="id" type="int">  
-                <constraints  primaryKey="true" nullable="false"/>  
-            </column>
-            <column name="message" type="VARCHAR(30)">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-    </changeSet>
-	<changeSet id="2" author="liquibase-docs">
-        <addAutoIncrement
-            tableName="message"
-            columnDataType="int"
-            columnName="id"
-            incrementBy="1"
-            schemaName="public"
-            startWith="1"
-            />
-    </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/src/Frank2Transactions/XA/src/main/resources/DeploymentSpecifics.properties b/src/Frank2Transactions/XA/src/main/resources/DeploymentSpecifics.properties
deleted file mode 100644
index 86abc0b4..00000000
--- a/src/Frank2Transactions/XA/src/main/resources/DeploymentSpecifics.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-instance.name=Frank2Transactions
-jdbc.migrator.active=true
\ No newline at end of file
diff --git a/src/Frank2Transactions/XA/src/main/resources/resources.yml b/src/Frank2Transactions/XA/src/main/resources/resources.yml
deleted file mode 100644
index 6b429057..00000000
--- a/src/Frank2Transactions/XA/src/main/resources/resources.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-jdbc:
-  # Postgres XA does not work without Narayana, gives ClassCastException casting the XA datasource to Java datasource, so add non-XA for those cases
-  # - name: "frank2transactions"
-  #   type: "org.postgresql.Driver"
-  #   url: "jdbc:postgresql://${jdbc.hostname:-localhost}:5432/testiaf"
-  #   authalias: "${db.authalias}"
-  #   username: "testiaf_user"
-  #   password: "testiaf_user00"
-
-  - name: "frank2transactions"
-    type: "org.postgresql.xa.PGXADataSource"
-    url: "jdbc:postgresql://${jdbc.hostname:-localhost}:5432/testiaf"
-    authalias: "${db.authalias}"
-    username: "testiaf_user"
-    password: "testiaf_user00"
-
-jms:
-  - name: "qcf-artemis"
-    type: "org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory"
-    url: "tcp://${jms.hostname:-localhost}:61615"
-
-