diff --git a/api-gateway/src/jvmMain/kotlin/at/mocode/gateway/config/MonitoringConfig.kt b/api-gateway/src/jvmMain/kotlin/at/mocode/gateway/config/MonitoringConfig.kt
index 1cbfa4d0..ab560233 100644
--- a/api-gateway/src/jvmMain/kotlin/at/mocode/gateway/config/MonitoringConfig.kt
+++ b/api-gateway/src/jvmMain/kotlin/at/mocode/gateway/config/MonitoringConfig.kt
@@ -1,17 +1,15 @@
 package at.mocode.gateway.config
 
+import at.mocode.dto.base.ApiResponse
+import at.mocode.shared.config.AppConfig
+import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.statuspages.*
 import io.ktor.server.request.*
-import io.ktor.http.*
 import io.ktor.server.response.*
-import io.ktor.util.*
-import at.mocode.dto.base.ApiResponse
-import at.mocode.shared.config.AppConfig
-import org.slf4j.MDC
 import org.slf4j.event.Level
-import java.util.UUID
+import java.util.*
 
 /**
  * Monitoring and logging configuration for the API Gateway.
diff --git a/api-gateway/src/jvmMain/kotlin/at/mocode/gateway/module.kt b/api-gateway/src/jvmMain/kotlin/at/mocode/gateway/module.kt
index 9dad8442..34b673d8 100644
--- a/api-gateway/src/jvmMain/kotlin/at/mocode/gateway/module.kt
+++ b/api-gateway/src/jvmMain/kotlin/at/mocode/gateway/module.kt
@@ -4,11 +4,9 @@ import at.mocode.gateway.config.configureOpenApi
 import at.mocode.gateway.config.configureSwagger
 import at.mocode.gateway.routing.docRoutes
 import at.mocode.shared.config.AppConfig
-import at.mocode.shared.config.RateLimitConfig
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
-import io.ktor.server.application.ApplicationCallPipeline
 import io.ktor.server.http.content.*
 import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.contentnegotiation.*