diff --git a/src/cds/src/main/kotlin/org/icpclive/api/ContestInfo.kt b/src/cds/src/main/kotlin/org/icpclive/api/ContestInfo.kt
index 231759c0f..2806863bb 100644
--- a/src/cds/src/main/kotlin/org/icpclive/api/ContestInfo.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/api/ContestInfo.kt
@@ -4,10 +4,7 @@ import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import org.icpclive.util.ColorSerializer
-import org.icpclive.util.DurationInMillisecondsSerializer
-import org.icpclive.util.UnixMillisecondsSerializer
-import org.icpclive.util.getLogger
+import org.icpclive.util.*
 import java.awt.Color
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
diff --git a/src/cds/src/main/kotlin/org/icpclive/api/RunInfo.kt b/src/cds/src/main/kotlin/org/icpclive/api/RunInfo.kt
index ae4fb4c4f..73c47f078 100644
--- a/src/cds/src/main/kotlin/org/icpclive/api/RunInfo.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/api/RunInfo.kt
@@ -1,8 +1,6 @@
 package org.icpclive.api
 
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import org.icpclive.util.DurationInMillisecondsSerializer
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/ContestUpdate.kt b/src/cds/src/main/kotlin/org/icpclive/cds/ContestUpdate.kt
index f0377efcb..c9b9f5178 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/ContestUpdate.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/ContestUpdate.kt
@@ -1,8 +1,6 @@
 package org.icpclive.cds
 
-import org.icpclive.api.AnalyticsMessage
-import org.icpclive.api.ContestInfo
-import org.icpclive.api.RunInfo
+import org.icpclive.api.*
 
 sealed interface ContestUpdate
 data class InfoUpdate(val newInfo: ContestInfo) : ContestUpdate
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/AdvancedPropertiesAdapter.kt b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/AdvancedPropertiesAdapter.kt
index de73937af..b29d391f6 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/AdvancedPropertiesAdapter.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/AdvancedPropertiesAdapter.kt
@@ -6,12 +6,11 @@ import kotlinx.coroutines.flow.*
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import org.icpclive.api.*
-import org.icpclive.api.tunning.*
-import org.icpclive.cds.ContestUpdate
-import org.icpclive.cds.InfoUpdate
-import org.icpclive.cds.RunUpdate
-import org.icpclive.util.*
-import kotlin.time.Duration
+import org.icpclive.api.tunning.AdvancedProperties
+import org.icpclive.api.tunning.TeamInfoOverride
+import org.icpclive.cds.*
+import org.icpclive.util.getLogger
+import org.icpclive.util.humanReadable
 
 private sealed interface AdvancedAdapterEvent
 private class Update(val update: ContestUpdate) : AdvancedAdapterEvent
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/DifferenceAdapter.kt b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/DifferenceAdapter.kt
index d193d6e61..c817ac569 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/DifferenceAdapter.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/DifferenceAdapter.kt
@@ -1,6 +1,7 @@
 package org.icpclive.cds.adapters
 
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import org.icpclive.api.*
 import org.icpclive.cds.ContestUpdate
 
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/FirstToSolveAdapter.kt b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/FirstToSolveAdapter.kt
index e1c5ecdd3..2edccc92a 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/FirstToSolveAdapter.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/FirstToSolveAdapter.kt
@@ -1,9 +1,9 @@
 package org.icpclive.cds.adapters
 
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import org.icpclive.api.*
-import org.icpclive.cds.*
-import kotlin.time.Duration.Companion.minutes
+import org.icpclive.cds.ContestUpdate
 
 private fun RunInfo.setICPC(value: Boolean) = copy(result = (result as? ICPCRunResult)?.copy(isFirstToSolveRun = value))
 private fun RunInfo.setIOI(value: Boolean) = copy(result = (result as? IOIRunResult)?.copy(isFirstBestRun = value))
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/RemoveFrozenSubmissionsAdapter.kt b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/RemoveFrozenSubmissionsAdapter.kt
index 0f2f245dd..45b46c220 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/RemoveFrozenSubmissionsAdapter.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/RemoveFrozenSubmissionsAdapter.kt
@@ -1,10 +1,8 @@
 package org.icpclive.cds.adapters
 
-import kotlinx.coroutines.flow.*
-import org.icpclive.cds.AnalyticsUpdate
-import org.icpclive.cds.ContestUpdate
-import org.icpclive.cds.InfoUpdate
-import org.icpclive.cds.RunUpdate
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.transform
+import org.icpclive.cds.*
 import kotlin.time.Duration
 
 
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/Utils.kt b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/Utils.kt
index 15dfde52d..f2284f15e 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/Utils.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/Utils.kt
@@ -1,16 +1,10 @@
 package org.icpclive.cds.adapters
 
-import kotlinx.collections.immutable.PersistentList
-import kotlinx.collections.immutable.PersistentMap
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.*
 import kotlinx.coroutines.flow.*
 import org.icpclive.api.ContestInfo
 import org.icpclive.api.RunInfo
-import org.icpclive.cds.AnalyticsUpdate
-import org.icpclive.cds.ContestUpdate
-import org.icpclive.cds.InfoUpdate
-import org.icpclive.cds.RunUpdate
+import org.icpclive.cds.*
 
 class ContestEventWithRunsBefore(
     val event: ContestUpdate,
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/cats/CATSDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/cats/CATSDataSource.kt
index 75b6fd5e7..e9ad9d857 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/cats/CATSDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/cats/CATSDataSource.kt
@@ -1,18 +1,12 @@
 package org.icpclive.cds.cats
 
 import kotlinx.datetime.*
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import org.icpclive.api.*
-import org.icpclive.cds.common.ContestParseResult
-import org.icpclive.cds.common.FullReloadContestDataSource
-import org.icpclive.cds.common.jsonLoader
+import org.icpclive.cds.common.*
 import org.icpclive.cds.settings.CatsSettings
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsDataSource.kt
index e9e01dca1..fbc5e4f3a 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsDataSource.kt
@@ -5,18 +5,15 @@ import kotlinx.coroutines.flow.*
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
-import org.icpclive.api.AnalyticsCommentaryEvent
-import org.icpclive.api.AnalyticsMessage
-import org.icpclive.api.ContestInfo
-import org.icpclive.api.RunInfo
+import org.icpclive.api.*
 import org.icpclive.cds.*
 import org.icpclive.cds.clics.api.Event
 import org.icpclive.cds.clics.api.Event.*
 import org.icpclive.cds.common.*
-import org.icpclive.cds.common.RawContestDataSource
 import org.icpclive.cds.settings.ClicsLoaderSettings
 import org.icpclive.cds.settings.ClicsSettings
-import org.icpclive.util.*
+import org.icpclive.util.getLogger
+import org.icpclive.util.logAndRetryWithDelay
 import kotlin.time.Duration.Companion.seconds
 
 enum class FeedVersion {
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsModel.kt b/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsModel.kt
index c52bcdcc3..254120fa4 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsModel.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsModel.kt
@@ -3,9 +3,7 @@ package org.icpclive.cds.clics
 import kotlinx.datetime.Instant
 import org.icpclive.api.*
 import org.icpclive.cds.clics.api.*
-import org.icpclive.cds.clics.model.ClicsJudgementTypeInfo
-import org.icpclive.cds.clics.model.ClicsOrganisationInfo
-import org.icpclive.cds.clics.model.ClicsRunInfo
+import org.icpclive.cds.clics.model.*
 import org.icpclive.util.Enumerator
 import org.icpclive.util.getLogger
 import java.awt.Color
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsTime.kt b/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsTime.kt
index a6ce5db3e..bb16cb169 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsTime.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsTime.kt
@@ -2,15 +2,13 @@ package org.icpclive.cds.clics
 
 import kotlinx.datetime.*
 import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
-import java.util.regex.Pattern
+import java.util.regex.*
 import kotlin.math.round
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/clics/api/Events.kt b/src/cds/src/main/kotlin/org/icpclive/cds/clics/api/Events.kt
index 9a79aaee3..6e33d327d 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/clics/api/Events.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/clics/api/Events.kt
@@ -1,9 +1,8 @@
 package org.icpclive.cds.clics.api
 
-import org.icpclive.cds.clics.api.v1.Event as EventV1
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import org.icpclive.cds.clics.api.v1.Event as EventV1
 
 @Serializable
 sealed class Event {
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/clics/model/ClicsRunInfo.kt b/src/cds/src/main/kotlin/org/icpclive/cds/clics/model/ClicsRunInfo.kt
index 477dfebfb..d296bd67b 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/clics/model/ClicsRunInfo.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/clics/model/ClicsRunInfo.kt
@@ -1,6 +1,5 @@
 package org.icpclive.cds.clics.model
 
-import org.icpclive.api.ICPCRunResult
 import org.icpclive.api.MediaType
 import org.icpclive.api.Verdict
 import org.icpclive.cds.clics.api.Problem
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/codedrills/CodeDrillsDataSoruce.kt b/src/cds/src/main/kotlin/org/icpclive/cds/codedrills/CodeDrillsDataSoruce.kt
index 6bb457b2e..ae49da874 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/codedrills/CodeDrillsDataSoruce.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/codedrills/CodeDrillsDataSoruce.kt
@@ -1,16 +1,16 @@
 package org.icpclive.cds.codedrills
 
 import io.codedrills.proto.external.*
-import io.grpc.*
-import io.grpc.stub.*
+import io.grpc.ManagedChannelBuilder
+import io.grpc.Metadata
+import io.grpc.stub.MetadataUtils
 import kotlinx.datetime.Instant
 import org.icpclive.api.*
 import org.icpclive.cds.common.ContestParseResult
 import org.icpclive.cds.common.FullReloadContestDataSource
 import org.icpclive.cds.settings.CodeDrillsSettings
 import org.icpclive.util.getLogger
-import java.util.*
-import java.util.concurrent.TimeUnit
+import java.util.concurrent.*
 import kotlin.time.Duration.Companion.seconds
 
 internal class CodeDrillsClient(url: String, port: Int, authKey: String) : AutoCloseable {
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/codeforces/CFDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/codeforces/CFDataSource.kt
index 27afdbe0d..1cd366c37 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/codeforces/CFDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/codeforces/CFDataSource.kt
@@ -2,13 +2,11 @@ package org.icpclive.cds.codeforces
 
 import kotlinx.datetime.Clock
 import org.icpclive.api.ContestStatus
-import org.icpclive.cds.common.ContestParseResult
-import org.icpclive.cds.common.FullReloadContestDataSource
-import org.icpclive.cds.codeforces.api.data.*
+import org.icpclive.cds.codeforces.api.data.CFHack
+import org.icpclive.cds.codeforces.api.data.CFSubmission
 import org.icpclive.cds.codeforces.api.results.CFStandings
 import org.icpclive.cds.codeforces.api.results.CFStatusWrapper
-import org.icpclive.cds.common.jsonLoader
-import org.icpclive.cds.common.map
+import org.icpclive.cds.common.*
 import org.icpclive.cds.settings.CFSettings
 import java.security.MessageDigest
 import java.util.*
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/codeforces/api/results/CFStandings.kt b/src/cds/src/main/kotlin/org/icpclive/cds/codeforces/api/results/CFStandings.kt
index 3ebdae972..f823c8980 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/codeforces/api/results/CFStandings.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/codeforces/api/results/CFStandings.kt
@@ -1,9 +1,7 @@
 package org.icpclive.cds.codeforces.api.results
 
 import kotlinx.serialization.Serializable
-import org.icpclive.cds.codeforces.api.data.CFContest
-import org.icpclive.cds.codeforces.api.data.CFProblem
-import org.icpclive.cds.codeforces.api.data.CFRankListRow
+import org.icpclive.cds.codeforces.api.data.*
 
 @Serializable
 internal data class CFStandings(
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/common/ContestParseResult.kt b/src/cds/src/main/kotlin/org/icpclive/cds/common/ContestParseResult.kt
index e8edd9e16..63890457c 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/common/ContestParseResult.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/common/ContestParseResult.kt
@@ -1,9 +1,7 @@
 package org.icpclive.cds.common
 
 import kotlinx.serialization.Serializable
-import org.icpclive.api.AnalyticsMessage
-import org.icpclive.api.ContestInfo
-import org.icpclive.api.RunInfo
+import org.icpclive.api.*
 
 @Serializable
 internal data class ContestParseResult(
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/common/DataLoader.kt b/src/cds/src/main/kotlin/org/icpclive/cds/common/DataLoader.kt
index fa30be5fa..ed739ea11 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/common/DataLoader.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/common/DataLoader.kt
@@ -3,7 +3,6 @@ package org.icpclive.cds.common
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import org.w3c.dom.Document
 import java.nio.file.Paths
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/common/FullReloadContestDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/common/FullReloadContestDataSource.kt
index 14aefc875..f8d492d1b 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/common/FullReloadContestDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/common/FullReloadContestDataSource.kt
@@ -3,9 +3,7 @@ package org.icpclive.cds.common
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
-import org.icpclive.cds.AnalyticsUpdate
-import org.icpclive.cds.InfoUpdate
-import org.icpclive.cds.RunUpdate
+import org.icpclive.cds.*
 import org.icpclive.util.getLogger
 import org.icpclive.util.loopFlow
 import kotlin.time.Duration
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/common/LineStreamLoaderService.kt b/src/cds/src/main/kotlin/org/icpclive/cds/common/LineStreamLoaderService.kt
index 2494c56c8..62bd1849e 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/common/LineStreamLoaderService.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/common/LineStreamLoaderService.kt
@@ -5,8 +5,9 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.utils.io.*
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
 import org.icpclive.util.getLogger
 import java.nio.file.Paths
 
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/ejudge/EjudgeDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/ejudge/EjudgeDataSource.kt
index 17707a706..8cda644c8 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/ejudge/EjudgeDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/ejudge/EjudgeDataSource.kt
@@ -2,13 +2,9 @@ package org.icpclive.cds.ejudge
 
 import kotlinx.datetime.Instant
 import org.icpclive.api.*
-import org.icpclive.cds.common.ContestParseResult
-import org.icpclive.cds.common.FullReloadContestDataSource
-import org.icpclive.cds.common.xmlLoader
+import org.icpclive.cds.common.*
 import org.icpclive.cds.settings.EjudgeSettings
-import org.icpclive.util.child
-import org.icpclive.util.children
-import org.icpclive.util.guessDatetimeFormat
+import org.icpclive.util.*
 import org.w3c.dom.Element
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/krsu/KRSUDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/krsu/KRSUDataSource.kt
index b0b54b95b..92b302d9f 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/krsu/KRSUDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/krsu/KRSUDataSource.kt
@@ -1,13 +1,11 @@
 package org.icpclive.cds.krsu
 
-import kotlinx.datetime.*
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.toInstant
 import kotlinx.serialization.Serializable
 import org.icpclive.api.*
-import org.icpclive.cds.common.ContestParseResult
-import org.icpclive.cds.common.FullReloadContestDataSource
-import org.icpclive.cds.common.jsonLoader
+import org.icpclive.cds.common.*
 import org.icpclive.cds.settings.KRSUSettings
-import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.seconds
 
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/noop/NoopDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/noop/NoopDataSource.kt
index 718e7a347..145cbe5f0 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/noop/NoopDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/noop/NoopDataSource.kt
@@ -1,9 +1,10 @@
 package org.icpclive.cds.noop
 
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.datetime.Instant
 import org.icpclive.api.*
-import org.icpclive.cds.*
+import org.icpclive.cds.InfoUpdate
 import org.icpclive.cds.common.ContestParseResult
 import org.icpclive.cds.common.RawContestDataSource
 import kotlin.time.Duration
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/pcms/PCMSDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/pcms/PCMSDataSource.kt
index 0a4ec2e25..f1d70cf0d 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/pcms/PCMSDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/pcms/PCMSDataSource.kt
@@ -3,10 +3,7 @@ package org.icpclive.cds.pcms
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import org.icpclive.api.*
-import org.icpclive.cds.common.ContestParseResult
-import org.icpclive.cds.common.FullReloadContestDataSource
-import org.icpclive.cds.common.ClientAuth
-import org.icpclive.cds.common.xmlLoader
+import org.icpclive.cds.common.*
 import org.icpclive.cds.settings.PCMSSettings
 import org.icpclive.util.*
 import org.w3c.dom.Element
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/settings/CDSSettings.kt b/src/cds/src/main/kotlin/org/icpclive/cds/settings/CDSSettings.kt
index beb6b2943..d53e3343e 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/settings/CDSSettings.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/settings/CDSSettings.kt
@@ -24,11 +24,8 @@ import org.icpclive.cds.noop.NoopDataSource
 import org.icpclive.cds.pcms.PCMSDataSource
 import org.icpclive.cds.testsys.TestSysDataSource
 import org.icpclive.cds.yandex.YandexDataSource
-import org.icpclive.util.HumanTimeSerializer
-import org.icpclive.util.TimeZoneSerializer
-import org.icpclive.util.getLogger
+import org.icpclive.util.*
 import java.nio.file.Path
-import javax.swing.text.StyledEditorKit.BoldAction
 
 // I'd like to have them in cds files, but then serializing would be much harder
 
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/testsys/TestSysDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/testsys/TestSysDataSource.kt
index d3512ea44..0aae37d36 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/testsys/TestSysDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/testsys/TestSysDataSource.kt
@@ -3,10 +3,7 @@ package org.icpclive.cds.testsys
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toKotlinLocalDateTime
 import org.icpclive.api.*
-import org.icpclive.cds.common.ContestParseResult
-import org.icpclive.cds.common.FullReloadContestDataSource
-import org.icpclive.cds.common.ByteArrayLoader
-import org.icpclive.cds.common.map
+import org.icpclive.cds.common.*
 import org.icpclive.cds.settings.TestSysSettings
 import java.nio.charset.Charset
 import java.time.format.DateTimeFormatter
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/yandex/YandexContestInfo.kt b/src/cds/src/main/kotlin/org/icpclive/cds/yandex/YandexContestInfo.kt
index e7ee596f9..9b5ae3b8e 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/yandex/YandexContestInfo.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/yandex/YandexContestInfo.kt
@@ -1,6 +1,5 @@
 package org.icpclive.cds.yandex
 
-import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import org.icpclive.api.*
 import org.icpclive.cds.yandex.api.*
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/yandex/YandexDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/yandex/YandexDataSource.kt
index 35b4ab512..cce82783c 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/yandex/YandexDataSource.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/yandex/YandexDataSource.kt
@@ -8,7 +8,6 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import kotlinx.serialization.json.Json
 import org.icpclive.cds.*
-import org.icpclive.cds.common.RawContestDataSource
 import org.icpclive.cds.common.*
 import org.icpclive.cds.settings.YandexSettings
 import org.icpclive.cds.yandex.api.*
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/yandex/api/Problem.kt b/src/cds/src/main/kotlin/org/icpclive/cds/yandex/api/Problem.kt
index a919e0f96..a6800342e 100644
--- a/src/cds/src/main/kotlin/org/icpclive/cds/yandex/api/Problem.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/cds/yandex/api/Problem.kt
@@ -1,7 +1,6 @@
 package org.icpclive.cds.yandex.api
 
 import kotlinx.serialization.Serializable
-import org.icpclive.api.ProblemInfo
 
 @Serializable
 internal data class Problems(
diff --git a/src/cds/src/main/kotlin/org/icpclive/scoreboard/AbstractScoreboardCalculator.kt b/src/cds/src/main/kotlin/org/icpclive/scoreboard/AbstractScoreboardCalculator.kt
index 76e0a4576..37e4f2823 100644
--- a/src/cds/src/main/kotlin/org/icpclive/scoreboard/AbstractScoreboardCalculator.kt
+++ b/src/cds/src/main/kotlin/org/icpclive/scoreboard/AbstractScoreboardCalculator.kt
@@ -1,9 +1,6 @@
 package org.icpclive.scoreboard
 
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.conflate
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.*
 import org.icpclive.api.*
 import org.icpclive.cds.adapters.ContestStateWithRunsByTeam
 import org.icpclive.util.getLogger
diff --git a/src/cds/src/test/kotlin/org/icpclive/cds/clics/CdsLoadersTest.kt b/src/cds/src/test/kotlin/org/icpclive/cds/clics/CdsLoadersTest.kt
index 43c60797e..2546ad574 100644
--- a/src/cds/src/test/kotlin/org/icpclive/cds/clics/CdsLoadersTest.kt
+++ b/src/cds/src/test/kotlin/org/icpclive/cds/clics/CdsLoadersTest.kt
@@ -5,10 +5,8 @@ import org.approvaltests.Approvals
 import org.approvaltests.core.Options
 import org.icpclive.api.ContestResultType
 import org.icpclive.cds.clics.FeedVersion
-import org.icpclive.cds.settings.CDSSettings
-import org.icpclive.cds.settings.ClicsSettings
-import org.icpclive.cds.settings.PCMSSettings
-import org.junit.*
+import org.icpclive.cds.settings.*
+import org.junit.Test
 
 class CdsLoadersTest {
     @Test
diff --git a/src/cds/src/test/kotlin/org/icpclive/cds/clics/ClicksTimeTest.kt b/src/cds/src/test/kotlin/org/icpclive/cds/clics/ClicksTimeTest.kt
index a6cb8e319..dcf9444ff 100644
--- a/src/cds/src/test/kotlin/org/icpclive/cds/clics/ClicksTimeTest.kt
+++ b/src/cds/src/test/kotlin/org/icpclive/cds/clics/ClicksTimeTest.kt
@@ -1,10 +1,8 @@
 package org.icpclive.cds.clics
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import org.icpclive.cds.clics.ClicsTime
 import org.junit.Assert
 import org.junit.Test
 import java.time.ZonedDateTime