diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AfmZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AfmZustaendigeStelleMapperTest.java
index 483c26f53553cdeaee6c60b384d021b442b20114..79c53555884a8df252546823046c1fff4b9bacfa 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AfmZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/AfmZustaendigeStelleMapperTest.java
@@ -28,10 +28,7 @@ import static org.mockito.Mockito.*;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -158,72 +155,6 @@ class AfmZustaendigeStelleMapperTest {
 			}
 		}
 
-		@Disabled
-		@Nested
-		class TestRemoveFields {
-
-			@Nested
-			class TestWithMappedValueOnly {
-
-				private FormData formData = FormData.builder().formData(AfmZustaendigeStelleTestFactory.createFormDataMap()).build();
-
-				@Test
-				void shouldRemoveZustaendigeStelle() {
-					var parsedFormData = parseFormData(formData);
-
-					assertThat(parsedFormData.getFormData().get(AfmZustaendigeStelleMapper.ZUSTAENDIGESTELLE)).isNull();
-				}
-			}
-
-			@Nested
-			class TestWithMappedAndNotMappedValue {
-
-				private static final String NOT_MAPPED_FIELD = "not_mapping_value";
-				private static final String NOT_MAPPED_VALUE = UUID.randomUUID().toString();
-
-				private FormData formData;
-
-				@BeforeEach
-				void buildFormData() {
-					var zustaendigeStelleMap = AfmZustaendigeStelleTestFactory.createZustaendigeStelleMap();
-					zustaendigeStelleMap.put(NOT_MAPPED_FIELD, NOT_MAPPED_VALUE);
-					var formDataMap = new HashMap<String, Object>();
-					formDataMap.put(AfmZustaendigeStelleMapper.ZUSTAENDIGESTELLE, zustaendigeStelleMap);
-
-					formData = FormData.builder().formData(formDataMap).build();
-				}
-
-				@Test
-				void shouldRemoveOrganisationseinheitenId() {
-					var parsedFormData = parseFormData(formData);
-
-					var zustaendigeStelle = getZustaendigeStelleMap(parsedFormData);
-					assertThat(zustaendigeStelle.get(AfmZustaendigeStelleMapper.ORGANISATIONSEINHEITEN_ID)).isNull();
-				}
-
-				@Test
-				void shouldRemoveEmail() {
-					var parsedFormData = parseFormData(formData);
-
-					var zustaendigeStelle = getZustaendigeStelleMap(parsedFormData);
-					assertThat(zustaendigeStelle.get(AfmZustaendigeStelleMapper.EMAIL)).isNull();
-				}
-
-				@Test
-				void shouldKeepNotMappedField() {
-					var parsedFormData = parseFormData(formData);
-
-					var zustaendigeStelle = getZustaendigeStelleMap(parsedFormData);
-					assertThat(zustaendigeStelle).containsEntry(NOT_MAPPED_FIELD, NOT_MAPPED_VALUE);
-				}
-
-				@SuppressWarnings("unchecked")
-				private Map<String, Object> getZustaendigeStelleMap(FormData formData) {
-					return (Map<String, Object>) formData.getFormData().get(AfmZustaendigeStelleMapper.ZUSTAENDIGESTELLE);
-				}
-			}
-		}
-
 		private FormData parseFormData(FormData formData) {
 			return mapper.parseFormData(formData);
 		}