diff --git a/src/chat_sdk/client.nim b/src/chat_sdk/client.nim
index bfdd6bd..b816a39 100644
--- a/src/chat_sdk/client.nim
+++ b/src/chat_sdk/client.nim
@@ -16,7 +16,6 @@ import # Foreign
   types
 
 import #local
-  conversation_store,
   conversations,
   conversations/convo_impl,
   crypto,
diff --git a/src/chat_sdk/conversation_store.nim b/src/chat_sdk/conversation_store.nim
index ce55efa..e629ea7 100644
--- a/src/chat_sdk/conversation_store.nim
+++ b/src/chat_sdk/conversation_store.nim
@@ -1,9 +1,5 @@
-import std/[options, times]
-
 import ./conversations/[convo_type, message]
-import crypto
 import identity
-import proto_types
 import types
 
 type ConvoId = string
diff --git a/src/chat_sdk/delivery/waku_client.nim b/src/chat_sdk/delivery/waku_client.nim
index 826ca52..1a04d2c 100644
--- a/src/chat_sdk/delivery/waku_client.nim
+++ b/src/chat_sdk/delivery/waku_client.nim
@@ -7,7 +7,6 @@ import
   libp2p/peerid,
   std/random,
   stew/byteutils,
-  std/sequtils,
   strformat,
   waku/[
     common/logging,
@@ -20,7 +19,7 @@ import
     waku_filter_v2/client,
   ]
 
-import ../utils, ../proto_types
+import ../proto_types
 
 logScope:
   topics = "chat waku"
diff --git a/src/chat_sdk/identity.nim b/src/chat_sdk/identity.nim
index 1740e24..cdc8218 100644
--- a/src/chat_sdk/identity.nim
+++ b/src/chat_sdk/identity.nim
@@ -1,8 +1,6 @@
 
 import crypto
-import utils
 import results
-import crypto
 
 
 type
diff --git a/src/chat_sdk/inbox.nim b/src/chat_sdk/inbox.nim
index 6ddff39..e94335d 100644
--- a/src/chat_sdk/inbox.nim
+++ b/src/chat_sdk/inbox.nim
@@ -11,8 +11,7 @@ import
   crypto,
   delivery/waku_client,
   proto_types,
-  types,
-  utils
+  types
 
 logScope:
   topics = "chat inbox"
diff --git a/src/chat_sdk/links.nim b/src/chat_sdk/links.nim
index 0738685..e877235 100644
--- a/src/chat_sdk/links.nim
+++ b/src/chat_sdk/links.nim
@@ -1,5 +1,4 @@
 import base64
-import chronicles
 import chronos
 import strformat
 import strutils
diff --git a/src/chat_sdk/utils.nim b/src/chat_sdk/utils.nim
index 5ce578f..d6b3a26 100644
--- a/src/chat_sdk/utils.nim
+++ b/src/chat_sdk/utils.nim
@@ -1,5 +1,5 @@
 import waku/waku_core
-import std/[macros, random, times]
+import std/[macros, times]
 import blake2
 import strutils
 
diff --git a/src/content_types/all.nim b/src/content_types/all.nim
index 0772639..8bd3f53 100644
--- a/src/content_types/all.nim
+++ b/src/content_types/all.nim
@@ -4,7 +4,6 @@
 import protobuf_serialization # This import is needed or th macro will not work
 import protobuf_serialization/proto_parser
 import results
-import std/random
 import strformat
 
 import ../chat_sdk/proto_types
diff --git a/src/naxolotl.nim b/src/naxolotl.nim
index aac60d4..f19bbaf 100644
--- a/src/naxolotl.nim
+++ b/src/naxolotl.nim
@@ -1,7 +1,6 @@
 import naxolotl/[
     naxolotl,
     curve25519,
-    types, 
     errors
 ]
 
diff --git a/src/naxolotl/chacha.nim b/src/naxolotl/chacha.nim
index d0d8add..a20bab9 100644
--- a/src/naxolotl/chacha.nim
+++ b/src/naxolotl/chacha.nim
@@ -1,8 +1,7 @@
-import nim_chacha20_poly1305/[common, chacha20_poly1305, streaming, helpers, poly1305]
+import nim_chacha20_poly1305/[common, chacha20_poly1305, poly1305]
 import std/[sysrand]
 import results
 import strformat
-import chronicles
 
 import types
 import errors
diff --git a/src/naxolotl/naxolotl.nim b/src/naxolotl/naxolotl.nim
index 553282c..8151899 100644
--- a/src/naxolotl/naxolotl.nim
+++ b/src/naxolotl/naxolotl.nim
@@ -1,7 +1,7 @@
 import curve25519
 import results
 import chronicles
-import nim_chacha20_poly1305/[common,helpers]
+import nim_chacha20_poly1305/common
 import strformat
 import strutils
 import sequtils