diff --git a/src/main/java/de/ozgcloud/xta/client/codes/BusinessScenario.java b/src/main/java/de/ozgcloud/xta/client/codes/BusinessScenario.java
deleted file mode 100644
index 46bd4247bceaab4aa30f1b1a394e078d729cf110..0000000000000000000000000000000000000000
--- a/src/main/java/de/ozgcloud/xta/client/codes/BusinessScenario.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * XTA-Client Java Library
- * Copyright (C) 2021 Koordinierungsstelle für IT-Standards (KoSIT)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package de.ozgcloud.xta.client.codes;
-
-import lombok.Getter;
-
-/**
- * Einige vordefinierte Werte für "business.scenario" (Fachkontext/Verfahren). Werte die nicht auftauchen können über den
- * Stringsetter gesetzt werden.
- *
- * @see <a href="https://www.xrepository.de/details/urn:de:xta:codeliste:business.scenario">business.scenario</a>
- */
-@Getter
-public enum BusinessScenario {
-
- /**
- * Fachkontext XBAULEITPLANUNG.
- */
- XBAULEITPLANUNG_DATA("XBAULEITPLANUNG_DATA"),
-
- /**
- * Fachkontext XDOMEAREG.
- */
- XDOMEAREG_DATA("XDOMEAREG_DATA"),
-
- /**
- * Fachkontext XInneres.
- */
- XINNERES_DATA("XINNERES_DATA"),
-
- /**
- * Fachkontext XAusländer.
- */
- XAUSLAENDER_DATA("XAUSLAENDER_DATA"),
-
- /**
- * Fachkontext OSCI-XMeld.
- */
- XMELD_DATA("XMELD_DATA"),
-
- /**
- * Fachkontext XPersonenstand.
- */
- XPERSONENSTAND_DATA("XPERSONENSTAND_DATA"),
-
- /**
- * Fachkontext XhD.
- */
- XHD_DATA("XHD_DATA"),
-
- /**
- * Fachkontext XGewerbeanzeige.
- */
- GEWERBE_DATA("GEWERBE_DATA");
-
- private String code;
-
- BusinessScenario(String code) {
- this.code = code;
- }
-}
diff --git a/src/main/java/de/ozgcloud/xta/client/codes/IdentifierType.java b/src/main/java/de/ozgcloud/xta/client/codes/IdentifierType.java
deleted file mode 100644
index 7b80214807430ef96ed0af1f915e38a247c8e716..0000000000000000000000000000000000000000
--- a/src/main/java/de/ozgcloud/xta/client/codes/IdentifierType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * XTA-Client Java Library
- * Copyright (C) 2021 Koordinierungsstelle für IT-Standards (KoSIT)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package de.ozgcloud.xta.client.codes;
-
-import lombok.Getter;
-
-/**
- * Einige vordefinierte Werte für "type.of.party.identifier". Werte die nicht auftauchen können über den Stringsetter gestzt werden * {@link
- * Identifier (final String, String)}
- *
- * @see <a href"https://www.xrepository.de/details/urn:de:xta:codeliste:type.of.party.identifier">type.of.party.identifier</a>
- */
-@Getter
-public enum IdentifierType {
-
- /**
- * XÖV-DVDV-Infrastruktur: Identifizierungsschema gemäß DVDV-Behördenschlüssel Nach den Regeln dieses Identifizierungsschemas
- * ist z.B. die Kennung "psw:01002110" aufgebaut.
- */
- XOEV("xoev"),
-
- /**
- * SAFE-Infrastruktur des Justizressorts: Identifizierungsschema gemäß SAFE Nach den Regeln dieses Identifizierungsschemas ist
- * z.B. die Kennung "safe-1363359638330-001060793" aufgebaut.
- */
- JUSTIZ("justiz");
-
- private String code;
-
- IdentifierType(String code) {
- this.code = code;
- }
-}
diff --git a/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java b/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java
index fed39a36ebad655d2d1691a14066d7037aae3fd4..14bdf0499aa8265eb430f31a09c266200a26e64e 100644
--- a/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java
+++ b/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java
@@ -1,14 +1,3 @@
-/**
- * XTA-Client Java Library Copyright (C) 2021 Koordinierungsstelle für IT-Standards (KoSIT)
- *
- * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
package de.ozgcloud.xta.client.config;
import static java.util.Collections.*;
diff --git a/src/main/java/de/ozgcloud/xta/client/exception/XtaClientException.java b/src/main/java/de/ozgcloud/xta/client/exception/XtaClientException.java
index e00a6b1cab96e6a0ea0ae2846b7328eecbbbb725..f2530d0647cd923735513241270c51bdbfd12b11 100644
--- a/src/main/java/de/ozgcloud/xta/client/exception/XtaClientException.java
+++ b/src/main/java/de/ozgcloud/xta/client/exception/XtaClientException.java
@@ -1,20 +1,3 @@
-/**
- * XTA-Client Java Library
- * Copyright (C) 2021 Koordinierungsstelle für IT-Standards (KoSIT)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
package de.ozgcloud.xta.client.exception;
diff --git a/src/main/java/de/ozgcloud/xta/client/exception/XtaClientInitializationException.java b/src/main/java/de/ozgcloud/xta/client/exception/XtaClientInitializationException.java
index 534c435fd644564646dd689ca371864e102f899b..0e361320c45fc3be0580d3f4ffdd3733fdba072d 100644
--- a/src/main/java/de/ozgcloud/xta/client/exception/XtaClientInitializationException.java
+++ b/src/main/java/de/ozgcloud/xta/client/exception/XtaClientInitializationException.java
@@ -1,20 +1,3 @@
-/**
- * XTA-Client Java Library
- * Copyright (C) 2021 Koordinierungsstelle für IT-Standards (KoSIT)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
package de.ozgcloud.xta.client.exception;
/**
diff --git a/src/test/java/de/ozgcloud/xta/client/FetchMessageParameterFactoryTest.java b/src/test/java/de/ozgcloud/xta/client/FetchMessageParameterFactoryTest.java
deleted file mode 100644
index b7984c306450621b847f11ea6d7bf6365501ab66..0000000000000000000000000000000000000000
--- a/src/test/java/de/ozgcloud/xta/client/FetchMessageParameterFactoryTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.ozgcloud.xta.client;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-
-class FetchMessageParameterFactoryTest {
-
- @DisplayName("create")
- @Nested
- class TestCreate {
-
- }
-}
\ No newline at end of file