diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/MeteroidRouter.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/MeteroidRouter.kt
index 91e9879d056335f01fe01c1bea615a51d60b9c68..867b98c609a94726ea1f92efd2b29088fcebc9c3 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/MeteroidRouter.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/MeteroidRouter.kt
@@ -35,7 +35,6 @@ import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
-import de.chaosdorf.meteroid.viewmodel.MeteroidRoute
 import de.chaosdorf.meteroid.ui.SetupRoute
 import de.chaosdorf.meteroid.ui.deposit.DepositRoute
 import de.chaosdorf.meteroid.ui.history.HistoryRoute
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt
index a562a73b7571239680c67c36acbe3215e5b5ce0e..0b330293d37a933a2cc7168cfec4b63177eea2c3 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt
@@ -28,19 +28,16 @@ import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStore
-import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ActivityComponent
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import de.chaosdorf.meteroid.storage.AccountPreferences
 import de.chaosdorf.meteroid.storage.AccountPreferencesImpl
 import de.chaosdorf.meteroid.storage.WrappedPreferences
 import de.chaosdorf.meteroid.storage.WrappedPreferencesImpl
-import javax.inject.Singleton
 
 val Context.accountDataStore: DataStore<Preferences> by preferencesDataStore(name = "account")
 val Context.wrappedDataStore: DataStore<Preferences> by preferencesDataStore(name = "wrapped")
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/storage/WrappedPreferencesImpl.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/storage/WrappedPreferencesImpl.kt
index c67301641c8b30c688b3292c1054a8df1f0b40e1..9212de7ab5766c122ac17405ce322c9f4cf23d04 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/storage/WrappedPreferencesImpl.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/storage/WrappedPreferencesImpl.kt
@@ -29,9 +29,6 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.longPreferencesKey
-import de.chaosdorf.mete.model.ServerId
-import de.chaosdorf.mete.model.UserId
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.mapLatest
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/OverlayNavigation.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/OverlayNavigation.kt
index df17f5959f218122197eff0a8bdcc0bab091bec0..b618343a4f30141dd7f5c2fb98b403bbf14a8e70 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/OverlayNavigation.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/OverlayNavigation.kt
@@ -29,12 +29,7 @@ import androidx.compose.animation.*
 import androidx.compose.animation.core.Transition
 import androidx.compose.animation.core.animateDp
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Surface
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/PersistentNavigation.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/PersistentNavigation.kt
index a0f96aa150df839bc1f729c1cc467e0088ef0676..6595c910b06a311e6385f2716520eed46a6912e5 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/PersistentNavigation.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/PersistentNavigation.kt
@@ -40,7 +40,6 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.TileMode
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
-import de.chaosdorf.meteroid.sync.SyncManager
 import de.chaosdorf.meteroid.sync.base.SyncHandler
 import de.chaosdorf.meteroid.viewmodel.NavigationElement
 import de.chaosdorf.meteroid.viewmodel.NavigationViewModel
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseDrinkTile.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseDrinkTile.kt
index 871e10d19c895fa9e90f7cdb55a1b9ea53ea4746..5b080bd0f482020766ae7494ea4bdfc27dd26ffa 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseDrinkTile.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseDrinkTile.kt
@@ -32,7 +32,10 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -46,7 +49,6 @@ import coil3.compose.rememberAsyncImagePainter
 import de.chaosdorf.meteroid.model.Drink
 import de.chaosdorf.meteroid.theme.secondaryGradient
 import de.chaosdorf.meteroid.ui.common.PriceBadge
-import kotlinx.coroutines.delay
 import java.math.BigDecimal
 import java.util.*
 
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseRoute.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseRoute.kt
index 73af9ccc25dd60e1c2fb3e10d47ad1ec1879f26d..9b872e6ea356511d531dc47fa3a56f0f7b3d5157 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseRoute.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseRoute.kt
@@ -24,11 +24,7 @@
 
 package de.chaosdorf.meteroid.ui.purchase
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.*
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
@@ -37,7 +33,6 @@ import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material3.Snackbar
-import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/serverlist/ServerListRoute.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/serverlist/ServerListRoute.kt
index 88c523698e4b4d06cdf816e146f904bafbf48eb5..e8737c5193b80ba9212f9ca7c54ec1bfdc9a055b 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/serverlist/ServerListRoute.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/serverlist/ServerListRoute.kt
@@ -32,8 +32,8 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import de.chaosdorf.meteroid.model.Server
-import de.chaosdorf.meteroid.viewmodel.MeteroidRoute
 import de.chaosdorf.meteroid.util.humanReadableHost
+import de.chaosdorf.meteroid.viewmodel.MeteroidRoute
 import de.chaosdorf.meteroid.viewmodel.Navigator
 import de.chaosdorf.meteroid.viewmodel.ServerListViewModel
 import kotlinx.coroutines.flow.update
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/HistoryViewModel.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/HistoryViewModel.kt
index a8bee77ce2747ce8b3b7656604ef3a51ef47674c..12171e2d46d3bf7412439ccee038017bea90efbd 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/HistoryViewModel.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/HistoryViewModel.kt
@@ -40,7 +40,6 @@ import de.chaosdorf.meteroid.sync.AccountProvider
 import de.chaosdorf.meteroid.sync.SyncManager
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
 import java.math.BigDecimal
 import kotlin.time.Duration.Companion.minutes
 
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/PurchaseViewModel.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/PurchaseViewModel.kt
index a06ece62bc652f5ff08b702b8435066cfa0b42e4..2a925608a92fcfe7347d1136a3f40c7c9ca7479e 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/PurchaseViewModel.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/PurchaseViewModel.kt
@@ -65,7 +65,7 @@ class PurchaseViewModel @AssistedInject constructor(
   private val accountProvider: AccountProvider,
   private val syncManager: SyncManager,
   wrappedPreferences: WrappedPreferences,
-  private val accountPreferences: AccountPreferences,
+  accountPreferences: AccountPreferences,
   drinkRepository: DrinkRepository,
 ) : ViewModel() {
   val serverId: ServerId = ServerId(server)
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/WrappedViewModel.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/WrappedViewModel.kt
index 6a8fa746f2a6755b05b703a84c6a9becf6f75e7d..113dd58498be3e3035f77bea8d570963e826ff94 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/WrappedViewModel.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/WrappedViewModel.kt
@@ -39,7 +39,6 @@ import de.chaosdorf.meteroid.model.Transaction
 import de.chaosdorf.meteroid.model.TransactionRepository
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.datetime.*