diff --git a/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt b/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
index 9f00473ac12013a53381951d3ee12d65dffe43fc..4f2b03210d96fa219f97fd64fe6469685d4591ed 100644
--- a/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
@@ -22,12 +22,27 @@ package de.justjanne.quasseldroid.app
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.*
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TextField
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.MoreVert
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
diff --git a/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
index d4831f1ed3410df583df08a1669a051cde834a1a..0f797ed9260e1f7a775f2db814cf128ed8bef244 100644
--- a/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
+++ b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
@@ -23,10 +23,23 @@ import de.justjanne.bitflags.of
 import de.justjanne.libquassel.client.io.CoroutineChannel
 import de.justjanne.libquassel.client.testutil.QuasselCoreContainer
 import de.justjanne.libquassel.client.testutil.TestX509TrustManager
-import de.justjanne.libquassel.protocol.connection.*
+import de.justjanne.libquassel.protocol.connection.ConnectionHeader
+import de.justjanne.libquassel.protocol.connection.ConnectionHeaderSerializer
+import de.justjanne.libquassel.protocol.connection.ProtocolFeature
+import de.justjanne.libquassel.protocol.connection.ProtocolInfoSerializer
+import de.justjanne.libquassel.protocol.connection.ProtocolMeta
+import de.justjanne.libquassel.protocol.connection.ProtocolVersion
 import de.justjanne.libquassel.protocol.features.FeatureSet
 import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.messages.handshake.*
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInit
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInitAck
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLogin
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLoginAck
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLoginReject
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupAck
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupData
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupReject
+import de.justjanne.libquassel.protocol.messages.handshake.SessionInit
 import de.justjanne.libquassel.protocol.serializers.HandshakeSerializers
 import de.justjanne.libquassel.protocol.serializers.handshake.ClientInitSerializer
 import de.justjanne.libquassel.protocol.serializers.handshake.ClientLoginSerializer
diff --git a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
index eaf57b7d49dba2e20f19edee04eea13e3db625e4..85ba491e54b6d45ddaa10f57df6089baa416c14c 100644
--- a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
@@ -24,7 +24,11 @@ import de.justjanne.bitflags.toBits
 import de.justjanne.libquassel.protocol.features.LegacyFeature
 import de.justjanne.libquassel.protocol.features.QuasselFeatureName
 import de.justjanne.libquassel.protocol.messages.handshake.ClientInitAck
-import de.justjanne.libquassel.protocol.variant.*
+import de.justjanne.libquassel.protocol.variant.QStringList
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object ClientInitAckSerializer : HandshakeSerializer<ClientInitAck> {
   override val type: String = "ClientInitAck"
diff --git a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
index 139ae6f47d9bda32f4cc28cff6f162ec27daa930..72e71c7bd95ec3adfebed583e3b6ea834507caf6 100644
--- a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
@@ -23,7 +23,11 @@ import de.justjanne.libquassel.protocol.features.FeatureSet
 import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
 import de.justjanne.libquassel.protocol.types.TimeSpec
 import de.justjanne.libquassel.protocol.variant.QtType
-import org.threeten.bp.*
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.OffsetDateTime
+import org.threeten.bp.ZoneOffset
+import org.threeten.bp.ZonedDateTime
 import org.threeten.bp.temporal.Temporal
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
index b427b8368ce743332e863e4332ece97a97f30333..b0543e506bb149680d40438a9d6c305bc3273f86 100644
--- a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
@@ -21,7 +21,11 @@ package de.justjanne.libquassel.protocol.serializers.primitive
 
 import de.justjanne.libquassel.protocol.features.FeatureSet
 import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.variant.*
+import de.justjanne.libquassel.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
 import java.nio.ByteBuffer
 
 object HandshakeMapSerializer : QtSerializer<QVariantMap> {
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializerTest.kt
index 9555fc2c6e98b6bc508629591b321a1de511c65c..769fc7c80bcf9c6d20d161c4247e0a6751e36233 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializerTest.kt
@@ -25,10 +25,8 @@ import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
 import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-import org.threeten.bp.*
-import org.threeten.bp.chrono.JapaneseDate
-import org.threeten.bp.temporal.Temporal
+import org.threeten.bp.LocalDate
+import org.threeten.bp.Month
 
 class DateSerializerTest {
   @Test
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
index bc4478086789bc59a415d6f85bb92d9b953ad00c..0899fe88c31a259846b7703ac2bfbb1aa6b6ee84 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
@@ -26,7 +26,11 @@ import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.threeten.bp.*
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.Month
+import org.threeten.bp.ZoneId
+import org.threeten.bp.ZoneOffset
 import org.threeten.bp.chrono.JapaneseDate
 import org.threeten.bp.temporal.Temporal
 
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
index 4c1ea014b06c74e07dd90042050f9286e4fa6eb1..77abc63315fd103099b3a4fc587032308a716562 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
@@ -18,7 +18,6 @@
  */
 package de.justjanne.libquassel.protocol.serializers.primitive
 
-import de.justjanne.libquassel.protocol.features.FeatureSet
 import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
 import de.justjanne.libquassel.protocol.testutil.byteBufferOf
 import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
index ab3aa1cb09a58082528db61f581efa4eefe421c4..8b1132170ea44dba6f5ec480e3db8720833ea210 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
@@ -25,7 +25,14 @@ import de.justjanne.libquassel.protocol.features.FeatureSet
 import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
 import de.justjanne.libquassel.protocol.testutil.byteBufferOf
 import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
-import de.justjanne.libquassel.protocol.types.*
+import de.justjanne.libquassel.protocol.types.BufferId
+import de.justjanne.libquassel.protocol.types.BufferInfo
+import de.justjanne.libquassel.protocol.types.BufferType
+import de.justjanne.libquassel.protocol.types.Message
+import de.justjanne.libquassel.protocol.types.MessageFlag
+import de.justjanne.libquassel.protocol.types.MessageType
+import de.justjanne.libquassel.protocol.types.MsgId
+import de.justjanne.libquassel.protocol.types.NetworkId
 import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
index 6732f87c9db17fe7c102d133cca98a21be48d26f..32bf0c034887cfed6e76f9cc2db1117a3b0db2ff 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
@@ -20,7 +20,12 @@ package de.justjanne.libquassel.protocol.testutil.matchers
 
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
-import org.threeten.bp.*
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalTime
+import org.threeten.bp.OffsetDateTime
+import org.threeten.bp.ZonedDateTime
 import org.threeten.bp.temporal.Temporal
 
 class TemporalMatcher<T: Temporal>(
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
index 545c9d66ab4fe6d1e3d91e8214003acd19aee04a..1878dd2cb6b151e448309cc43c988c18323fd114 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
@@ -19,7 +19,6 @@
 package de.justjanne.libquassel.protocol.testutil
 
 import de.justjanne.libquassel.protocol.features.FeatureSet
-import de.justjanne.libquassel.protocol.io.contentToString
 import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
 import org.hamcrest.Matcher
 import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
index 7c7cea2b4391cf3f1682958ccdec153df3fbe2fa..867b605754f8192e71731fb20d8febae513b379a 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
@@ -19,7 +19,9 @@
 
 package de.justjanne.libquassel.protocol.types
 
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
 class SignedIdTest {