diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/HandshakeMessage.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/HandshakeMessage.kt
index b6a3cf11b28d2bb85c4772467c8b08d1cdb2eea4..d7203d82a6418b8f9c4d2bb864f3fb4e4293730d 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/HandshakeMessage.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/HandshakeMessage.kt
@@ -12,7 +12,6 @@ package de.justjanne.libquassel.protocol.models
 
 import de.justjanne.libquassel.protocol.features.FeatureSet
 import de.justjanne.libquassel.protocol.models.ids.NetworkId
-import de.justjanne.libquassel.protocol.variant.QVariantList
 import de.justjanne.libquassel.protocol.variant.QVariantMap
 
 /**
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/SignedId.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/SignedId.kt
index 1b25a641fa71908c0cfb6187a685de168380849a..e91f0c81a567a68a5640dc73cafa9ef3d74fd7e6 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/SignedId.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/SignedId.kt
@@ -10,7 +10,6 @@
 
 package de.justjanne.libquassel.protocol.models.ids
 
-import de.justjanne.libquassel.annotations.Generated
 import java.io.Serializable
 
 /**
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
index 3bde603ac38fced5d65b6066f7792ecad529fb6e..8511039789eb11f68ae333fed243eddfaa0c4f7a 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
@@ -44,9 +44,12 @@ object SessionInitSerializer : HandshakeSerializer<HandshakeMessage.SessionInit>
           },
           QtType.QVariantList
         ),
-        "Identities" to qVariant<QVariantList>(data.identities.map {
-          qVariant<QVariantMap>(it, QuasselType.Identity)
-        }, QtType.QVariantList),
+        "Identities" to qVariant<QVariantList>(
+          data.identities.map {
+            qVariant<QVariantMap>(it, QuasselType.Identity)
+          },
+          QtType.QVariantList
+        ),
       ),
       QtType.QVariantMap
     )
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ByteBufferSerializer.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ByteBufferSerializer.kt
index 0394c64896607e188e3e3ff94ad6a65f4a9c308d..28c88a017d9214fd6fb4d97ad64ef6b1467bc3b3 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ByteBufferSerializer.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ByteBufferSerializer.kt
@@ -12,7 +12,6 @@ package de.justjanne.libquassel.protocol.serializers.qt
 
 import de.justjanne.libquassel.protocol.features.FeatureSet
 import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.io.contentToString
 import de.justjanne.libquassel.protocol.io.copyData
 import de.justjanne.libquassel.protocol.serializers.PrimitiveSerializer
 import java.nio.ByteBuffer
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferInfoSerializer.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferInfoSerializer.kt
index e21f8a5a3b5cf9842664c22ad339f5b88b00335a..9857ba7728d681aa0cc7c4d9ef582431085a5cf2 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferInfoSerializer.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferInfoSerializer.kt
@@ -14,7 +14,6 @@ import de.justjanne.bitflags.of
 import de.justjanne.bitflags.toBits
 import de.justjanne.libquassel.protocol.features.FeatureSet
 import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.io.contentToString
 import de.justjanne.libquassel.protocol.models.BufferInfo
 import de.justjanne.libquassel.protocol.models.flags.BufferType
 import de.justjanne.libquassel.protocol.serializers.PrimitiveSerializer
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/BufferViewManager.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/BufferViewManager.kt
index 07f1b4898c3b40d89be37b0363794047011ae9cf..b2a6dbdf1c09e81e09e5c30a6002a35838fd2f9a 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/BufferViewManager.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/BufferViewManager.kt
@@ -52,7 +52,8 @@ open class BufferViewManager(
     }
 
     val config = BufferViewConfig(
-      session, BufferViewConfigState(
+      session,
+      BufferViewConfigState(
         bufferViewId = bufferViewConfigId
       )
     )
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/IgnoreListManager.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/IgnoreListManager.kt
index c16ba3e38980c01645a72e325486d920efc3db72..30254bc6ea1c52a76d06cff7e300ecf560db246b 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/IgnoreListManager.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/IgnoreListManager.kt
@@ -9,4 +9,3 @@
  */
 
 package de.justjanne.libquassel.protocol.syncables
-
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/Network.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/Network.kt
index 5b00831bc7c2c4ccbc982111a4bd585e152108f1..cee2ac65dc0831dc00ab6c3e23aee59bd8f56a47 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/Network.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/Network.kt
@@ -10,7 +10,6 @@
 
 package de.justjanne.libquassel.protocol.syncables
 
-import de.justjanne.libquassel.protocol.models.ChannelModeType
 import de.justjanne.libquassel.protocol.models.ConnectionState
 import de.justjanne.libquassel.protocol.models.NetworkInfo
 import de.justjanne.libquassel.protocol.models.NetworkServer
@@ -23,16 +22,13 @@ import de.justjanne.libquassel.protocol.syncables.state.IrcChannelState
 import de.justjanne.libquassel.protocol.syncables.state.IrcUserState
 import de.justjanne.libquassel.protocol.syncables.state.NetworkState
 import de.justjanne.libquassel.protocol.syncables.stubs.NetworkStub
-import de.justjanne.libquassel.protocol.util.collections.indices
-import de.justjanne.libquassel.protocol.util.irc.HostmaskHelper
-import de.justjanne.libquassel.protocol.util.irc.IrcISupport
 import de.justjanne.libquassel.protocol.util.collections.transpose
+import de.justjanne.libquassel.protocol.util.irc.HostmaskHelper
 import de.justjanne.libquassel.protocol.util.update
 import de.justjanne.libquassel.protocol.variant.QVariantList
 import de.justjanne.libquassel.protocol.variant.QVariantMap
 import de.justjanne.libquassel.protocol.variant.into
 import de.justjanne.libquassel.protocol.variant.qVariant
-import kotlinx.coroutines.flow.MutableStateFlow
 import java.nio.ByteBuffer
 
 open class Network(
@@ -322,7 +318,8 @@ open class Network(
     }
 
     val user = IrcUser(
-      session, IrcUserState(
+      session,
+      IrcUserState(
         network = networkId(),
         nick = nick,
         user = ident,
@@ -351,7 +348,8 @@ open class Network(
     }
 
     val channel = IrcChannel(
-      session, IrcChannelState(
+      session,
+      IrcChannelState(
         network = networkId(),
         name = name
       )
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/StatefulSyncableObject.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/StatefulSyncableObject.kt
index b30b70c3259e8352af7abf3e39dab066c2007c52..70a5e936c06671e915ef3669b868f48bec6344e7 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/StatefulSyncableObject.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/StatefulSyncableObject.kt
@@ -18,7 +18,7 @@ abstract class StatefulSyncableObject<T>(
   state: T
 ) : SyncableObject(session, className) {
   override fun toString(): String {
-    return "$className(objectName=${objectName}, state=${state()})"
+    return "$className(objectName=$objectName, state=${state()})"
   }
 
   override fun equals(other: Any?): Boolean {
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/collections/pairs.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/collections/pairs.kt
index 92e0668fdd5075bb3b90067ce2f2406f659bda61..b4f01daa2030064211959d368badf107f1efedce 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/collections/pairs.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/collections/pairs.kt
@@ -10,9 +10,6 @@
 
 package de.justjanne.libquassel.protocol.util.collections
 
-import org.bouncycastle.util.io.Streams
-import java.util.stream.Stream
-
 /**
  * Returns a partitioned list of pairs
  */
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UuidSerializerTest.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UuidSerializerTest.kt
index 61da42012b487f45a3d5e76ad6f55da394c475c9..d0bbcac29b482b18122c9876fe953219fb8ea760 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UuidSerializerTest.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UuidSerializerTest.kt
@@ -41,7 +41,7 @@ class UuidSerializerTest {
     UuidSerializer,
     UUID.fromString("e4335bb0-ceef-4b9f-8ceb-be19b4da34fd"),
     byteBufferOf(
-      0xE4u, 0x33u, 0x5Bu, 0xB0u, 0xCEu, 0xEFu, 0x4Bu, 0x9Fu, 0x8Cu, 0xEBu, 0xBEu, 0x19u, 0xB4u, 0xDAu, 0x34u, 0xFDu, 
+      0xE4u, 0x33u, 0x5Bu, 0xB0u, 0xCEu, 0xEFu, 0x4Bu, 0x9Fu, 0x8Cu, 0xEBu, 0xBEu, 0x19u, 0xB4u, 0xDAu, 0x34u, 0xFDu,
     )
   )
 }
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/syncables/NetworkTest.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/syncables/NetworkTest.kt
index 75226e037500c1077c0e20330b48cfa348fd0215..acecf4044d71f025079207d71b1e6023f22a7751 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/syncables/NetworkTest.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/syncables/NetworkTest.kt
@@ -62,11 +62,11 @@ fun Random.nextNetwork(networkId: NetworkId) = NetworkState(
   capsEnabled = List(nextInt(20)) {
     nextString()
   }.toSet(),
-  serverList =  List(nextInt(20)) {
+  serverList = List(nextInt(20)) {
     nextNetworkServer()
   },
   useRandomServer = nextBoolean(),
-  perform =  List(nextInt(20)) {
+  perform = List(nextInt(20)) {
     nextString()
   },
   useAutoIdentify = nextBoolean(),
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/Random.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/Random.kt
index 29f8612e7f54ebada674d6422a23867948c78269..5cf9157becae6b5d4c55bca3d17cc4259afd6164 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/Random.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/Random.kt
@@ -33,7 +33,7 @@ fun <T> Random.nextOf(vararg elements: T): T {
   return nextOf(elements.toList())
 }
 
-inline fun <reified T: Enum<T>> Random.nextEnum(): T {
+inline fun <reified T : Enum<T>> Random.nextEnum(): T {
   return nextOf(EnumSet.allOf(T::class.java).toList())
 }
 
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
index d20a0e266cab9f3262416caf2b13143b74217eaf..d79c6b5eca9d99f990ec173bd7233da2ecd4fcec 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.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.io.useChainedByteBuffer
 import de.justjanne.libquassel.protocol.models.HandshakeMessage
 import de.justjanne.libquassel.protocol.serializers.HandshakeMessageSerializer
@@ -27,9 +26,7 @@ import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
 import de.justjanne.libquassel.protocol.util.withRewind
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
-import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertTrue
 import java.nio.ByteBuffer
 
 inline fun <reified T : HandshakeMessage> handshakeSerializerTest(
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testPrimitiveSerializerDirect.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testPrimitiveSerializerDirect.kt
index 7c9709d1e38820ed38f908c1cb3002a8db97f596..18369babe4335010c00d684cf98160dd68368390 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testPrimitiveSerializerDirect.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testPrimitiveSerializerDirect.kt
@@ -20,7 +20,6 @@ package de.justjanne.libquassel.protocol.testutil
 
 import de.justjanne.libquassel.protocol.features.FeatureSet
 import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.io.contentToString
 import de.justjanne.libquassel.protocol.serializers.PrimitiveSerializer
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat