diff --git a/backend/services/masterdata/masterdata-api/src/main/kotlin/at/mocode/masterdata/api/rest/FunktionaerController.kt b/backend/services/masterdata/masterdata-api/src/main/kotlin/at/mocode/masterdata/api/rest/FunktionaerController.kt
index df569c33..01c83de5 100644
--- a/backend/services/masterdata/masterdata-api/src/main/kotlin/at/mocode/masterdata/api/rest/FunktionaerController.kt
+++ b/backend/services/masterdata/masterdata-api/src/main/kotlin/at/mocode/masterdata/api/rest/FunktionaerController.kt
@@ -2,18 +2,13 @@
 
 package at.mocode.masterdata.api.rest
 
-import at.mocode.core.domain.model.FunktionaerRolleE
-import at.mocode.core.domain.model.RichterQualifikationE
-import at.mocode.core.domain.model.SparteE
 import at.mocode.core.domain.serialization.InstantSerializer
-import at.mocode.core.domain.serialization.LocalDateSerializer
 import at.mocode.masterdata.domain.model.DomFunktionaer
 import at.mocode.masterdata.domain.repository.FunktionaerRepository
 import io.ktor.http.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import kotlinx.datetime.LocalDate
 import kotlinx.serialization.Serializable
 import kotlin.time.Instant
 import kotlin.uuid.Uuid
diff --git a/backend/services/masterdata/masterdata-api/src/main/kotlin/at/mocode/masterdata/api/rest/HorseController.kt b/backend/services/masterdata/masterdata-api/src/main/kotlin/at/mocode/masterdata/api/rest/HorseController.kt
index 87cba1cc..a04aa144 100644
--- a/backend/services/masterdata/masterdata-api/src/main/kotlin/at/mocode/masterdata/api/rest/HorseController.kt
+++ b/backend/services/masterdata/masterdata-api/src/main/kotlin/at/mocode/masterdata/api/rest/HorseController.kt
@@ -4,14 +4,12 @@ package at.mocode.masterdata.api.rest
 
 import at.mocode.core.domain.model.PferdeGeschlechtE
 import at.mocode.core.domain.serialization.InstantSerializer
-import at.mocode.core.domain.serialization.LocalDateSerializer
 import at.mocode.masterdata.domain.model.DomPferd
 import at.mocode.masterdata.domain.repository.HorseRepository
 import io.ktor.http.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import kotlinx.datetime.LocalDate
 import kotlinx.serialization.Serializable
 import kotlin.time.Instant
 import kotlin.uuid.Uuid
diff --git a/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/model/DomFunktionaer.kt b/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/model/DomFunktionaer.kt
index 2df4a0b1..a63558ea 100644
--- a/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/model/DomFunktionaer.kt
+++ b/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/model/DomFunktionaer.kt
@@ -3,12 +3,8 @@
 package at.mocode.masterdata.domain.model
 
 import at.mocode.core.domain.model.DatenQuelleE
-import at.mocode.core.domain.model.FunktionaerRolleE
-import at.mocode.core.domain.model.RichterQualifikationE
-import at.mocode.core.domain.model.SparteE
 import at.mocode.core.domain.serialization.InstantSerializer
 import at.mocode.core.domain.serialization.UuidSerializer
-import kotlinx.datetime.LocalDate
 import kotlinx.serialization.Serializable
 import kotlin.time.Clock
 import kotlin.time.Instant
diff --git a/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/model/DomPferd.kt b/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/model/DomPferd.kt
index fe74a2e9..281e3278 100644
--- a/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/model/DomPferd.kt
+++ b/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/model/DomPferd.kt
@@ -4,10 +4,7 @@ package at.mocode.masterdata.domain.model
 
 import at.mocode.core.domain.model.DatenQuelleE
 import at.mocode.core.domain.model.PferdeGeschlechtE
-import at.mocode.core.domain.serialization.InstantSerializer
 import at.mocode.core.domain.serialization.UuidSerializer
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.number
 import kotlinx.datetime.todayIn
 import kotlinx.serialization.Serializable
 import kotlin.time.Clock
diff --git a/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/repository/FunktionaerRepository.kt b/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/repository/FunktionaerRepository.kt
index 103166ff..755d2133 100644
--- a/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/repository/FunktionaerRepository.kt
+++ b/backend/services/masterdata/masterdata-domain/src/commonMain/kotlin/at/mocode/masterdata/domain/repository/FunktionaerRepository.kt
@@ -2,9 +2,6 @@
 
 package at.mocode.masterdata.domain.repository
 
-import at.mocode.core.domain.model.FunktionaerRolleE
-import at.mocode.core.domain.model.RichterQualifikationE
-import at.mocode.core.domain.model.SparteE
 import at.mocode.masterdata.domain.model.DomFunktionaer
 import kotlin.uuid.Uuid
 
diff --git a/backend/services/masterdata/masterdata-infrastructure/src/main/kotlin/at/mocode/masterdata/infrastructure/persistence/ExposedFunktionaerRepository.kt b/backend/services/masterdata/masterdata-infrastructure/src/main/kotlin/at/mocode/masterdata/infrastructure/persistence/ExposedFunktionaerRepository.kt
index 09162544..81405b9e 100644
--- a/backend/services/masterdata/masterdata-infrastructure/src/main/kotlin/at/mocode/masterdata/infrastructure/persistence/ExposedFunktionaerRepository.kt
+++ b/backend/services/masterdata/masterdata-infrastructure/src/main/kotlin/at/mocode/masterdata/infrastructure/persistence/ExposedFunktionaerRepository.kt
@@ -3,15 +3,17 @@
 package at.mocode.masterdata.infrastructure.persistence
 
 import at.mocode.core.domain.model.DatenQuelleE
-import at.mocode.core.domain.model.FunktionaerRolleE
-import at.mocode.core.domain.model.RichterQualifikationE
-import at.mocode.core.domain.model.SparteE
 import at.mocode.core.utils.database.DatabaseFactory
 import at.mocode.masterdata.domain.model.DomFunktionaer
 import at.mocode.masterdata.domain.repository.FunktionaerRepository
 import org.jetbrains.exposed.v1.core.ResultRow
-import org.jetbrains.exposed.v1.core.*
-import org.jetbrains.exposed.v1.jdbc.*
+import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.v1.jdbc.update
 import kotlin.uuid.Uuid
 
 /**
diff --git a/backend/services/masterdata/masterdata-infrastructure/src/main/kotlin/at/mocode/masterdata/infrastructure/persistence/FunktionaerTable.kt b/backend/services/masterdata/masterdata-infrastructure/src/main/kotlin/at/mocode/masterdata/infrastructure/persistence/FunktionaerTable.kt
index a301a413..7f291721 100644
--- a/backend/services/masterdata/masterdata-infrastructure/src/main/kotlin/at/mocode/masterdata/infrastructure/persistence/FunktionaerTable.kt
+++ b/backend/services/masterdata/masterdata-infrastructure/src/main/kotlin/at/mocode/masterdata/infrastructure/persistence/FunktionaerTable.kt
@@ -4,7 +4,6 @@ package at.mocode.masterdata.infrastructure.persistence
 
 import org.jetbrains.exposed.v1.core.Table
 import org.jetbrains.exposed.v1.datetime.CurrentTimestamp
-import org.jetbrains.exposed.v1.datetime.date
 import org.jetbrains.exposed.v1.datetime.timestamp
 
 
diff --git a/core/zns-parser/src/commonTest/kotlin/at/mocode/zns/parser/ZnsLegacyParsersTest.kt b/core/zns-parser/src/commonTest/kotlin/at/mocode/zns/parser/ZnsLegacyParsersTest.kt
index ffd08227..0ad6c766 100644
--- a/core/zns-parser/src/commonTest/kotlin/at/mocode/zns/parser/ZnsLegacyParsersTest.kt
+++ b/core/zns-parser/src/commonTest/kotlin/at/mocode/zns/parser/ZnsLegacyParsersTest.kt
@@ -1,6 +1,5 @@
 package at.mocode.zns.parser
 
-import at.mocode.core.domain.model.LizenzKlasseE
 import at.mocode.core.domain.model.PferdeGeschlechtE
 import kotlin.test.Test
 import kotlin.test.assertEquals