diff --git a/src/chat.nim b/src/chat.nim
index 754d8da..8cabde4 100644
--- a/src/chat.nim
+++ b/src/chat.nim
@@ -1,17 +1,13 @@
 import chat/[
   client,
-  crypto,
-  conversations,
   delivery/waku_client,
   identity,
-  links,
   types
 ]
 
-export client, conversations, identity, links, waku_client
+export client, identity, waku_client
+export identity.`$`
 
 #export specific frames need by applications
 export MessageId
 
-export toHex
-export crypto.`$`
diff --git a/src/chat/client.nim b/src/chat/client.nim
index b2c160e..79af020 100644
--- a/src/chat/client.nim
+++ b/src/chat/client.nim
@@ -7,24 +7,14 @@ import # Foreign
   chronicles,
   chronos,
   libchat,
-  sds,
-  sequtils,
-  std/sequtils,
-  std/tables,
+  std/options,
   strformat,
-  strutils,
-  tables,
   types
 
 import #local
-  conversations,
-  conversations/convo_impl,
-  crypto,
   delivery/waku_client,
   errors,
   identity,
-  inbox,
-  proto_types,
   types,
   utils
 
diff --git a/src/chat/delivery/waku_client.nim b/src/chat/delivery/waku_client.nim
index 4662120..cb1f0dd 100644
--- a/src/chat/delivery/waku_client.nim
+++ b/src/chat/delivery/waku_client.nim
@@ -20,7 +20,6 @@ import
     waku_filter_v2/client,
   ]
 
-import ../proto_types
 
 logScope:
   topics = "chat waku"
diff --git a/src/chat/identity.nim b/src/chat/identity.nim
index 37b4267..d624ffb 100644
--- a/src/chat/identity.nim
+++ b/src/chat/identity.nim
@@ -1,6 +1,10 @@
 
-import crypto
+import crypto/ecdh
 import results
+import strformat
+import utils
+
+export PublicKey, PrivateKey, loadPrivateKeyFromBytes, loadPublicKeyFromBytes 
 
 
 type
diff --git a/src/content_types/all.nim b/src/content_types/all.nim
index f4b6425..0ced84a 100644
--- a/src/content_types/all.nim
+++ b/src/content_types/all.nim
@@ -6,8 +6,6 @@ import protobuf_serialization/proto_parser
 import results
 import strformat
 
-import ../chat/proto_types
-
 
 export protobuf_serialization