diff --git a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java
index f8eabb1f508c4acf6f53330b3bae49ba2fefd678..5a38b0661eece1053f78247321e1489364769121 100644
--- a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java
+++ b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java
@@ -70,9 +70,10 @@ class FormSolutionsRequestMapper {
 		}
 	}
 
+//TEST
 	private FormData removeProcessedData(FormData formData) {
 		Map<String, Object> data = formData.getFormData();
-
+//TODO immutable berucksichtigen
 		data.remove(ZIP);
 		data.remove(PDF);
 		data.remove(JSON);
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java
index 0cdf2991d73c8a57ab8eb3a92db137acfbfea029..9d228e3cff3ab2b538ec9373a4a21713701022c7 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java
@@ -42,7 +42,7 @@ public class SemantikAdapter {
 	@Autowired
 	private VorgangService vorgangService;
 
-	public void processFormData(FormData formData) {
+	public void processFormDGata(FormData formData) {
 		formData = parseByEngineAdapter(formData);
 		formData = parseByFormAdapter(formData);
 
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AbstractFileMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AbstractFileMapper.java
index 34d9daf90f5af5a210275e6864414e5bbfa72b1a..6b4ab4bcda54ca77384c7d9c27a9c60d2abce119 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AbstractFileMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AbstractFileMapper.java
@@ -84,6 +84,7 @@ public abstract class AbstractFileMapper implements EngineBasedMapper {
 	protected FormData removeProcessedData(FormData formData) {
 		Map<String, Object> mutableMap = new HashMap<>(formData.getFormData());
 		mutableMap.remove(MAPPED_FILES);
+		// TODO copyOf erlaubt keine null values -daher ausbauen
 		return formData.toBuilder().formData(Map.copyOf(mutableMap)).build();
 	}
 
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsAntragstellerMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsAntragstellerMapper.java
index beafef67c5397ad1991271637e7dc8a4e9fc21b0..9b68182489cf89049a9a5550fa2837136d98c907 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsAntragstellerMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsAntragstellerMapper.java
@@ -62,6 +62,7 @@ public class FormSolutionsAntragstellerMapper implements FormSolutionsEngineBase
 				.build();
 	}
 
+	// TODO auf immutable ma umstellen
 	private Map<String, String> findAntragstellerData(Map<String, Object> formData) {
 		Map<String, String> names = new HashMap<>();
 		addContent(getPanels(formData), names);
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsHeaderMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsHeaderMapper.java
index fe82cb56ed0e8a7dc720bf799307c083b66cb19e..ac13ff44b619fd9bdb49f616647edf7a380dedba 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsHeaderMapper.java
@@ -51,6 +51,7 @@ public class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper
 	private Map<String, Object> removeTransactionId(FormData processedData) {
 		Map<String, Object> cleanedData = new HashMap<>(processedData.getFormData());
 		cleanedData.remove(TRANSACTION_ID);
+		// TODO immutable machen
 		return cleanedData;
 	}
 
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsPanelMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsPanelMapper.java
index ce01b4d35f3c4ee7121640b2552cf9215c972740..31558e952f16cbb16f7c2a5dd1f84406dd2de25f 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsPanelMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsPanelMapper.java
@@ -51,6 +51,8 @@ public class FormSolutionsPanelMapper implements FormSolutionsEngineBasedMapper
 	@Override
 	public FormData parseFormData(FormData formData) {
 		var res = mapPanels(getPanels(formData));
+		// TODO was passiert hier? Sieht nach dem join von zwei maps aus nur irre
+		// komilziert
 		Map<String, Object> combinedMap = Stream.concat(res.entrySet().stream(), formData.getFormData().entrySet().stream())
 				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsZustaendigeStelleMapper.java
index 27a381ef2169a272986b8ca8ae80df505eabfd32..b0b1952fa4c2dcfc57459b324bf24b2eb2d2ffb3 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsZustaendigeStelleMapper.java
@@ -47,6 +47,7 @@ public class FormSolutionsZustaendigeStelleMapper implements FormSolutionsEngine
 	private Map<String, Object> removeZustaendigeStelle(FormData formData) {
 		var cleanedData = new HashMap<>(formData.getFormData());
 		cleanedData.remove(ZUSTAENDIGE_STELLE);
+		// TODO immutable machen
 		return cleanedData;
 	}
 }