diff --git a/src/chat.nim b/src/chat.nim
index 8cabde4..3bd3472 100644
--- a/src/chat.nim
+++ b/src/chat.nim
@@ -1,12 +1,10 @@
 import chat/[
   client,
   delivery/waku_client,
-  identity,
   types
 ]
 
-export client, identity, waku_client
-export identity.`$`
+export client, waku_client
 
 #export specific frames need by applications
 export MessageId
diff --git a/src/chat/client.nim b/src/chat/client.nim
index 48c0bd6..ecdac57 100644
--- a/src/chat/client.nim
+++ b/src/chat/client.nim
@@ -14,7 +14,6 @@ import # Foreign
 import #local
   delivery/waku_client,
   errors,
-  identity,
   types,
   utils
 
@@ -53,12 +52,6 @@ type
   DeliveryAckCallback* = proc(conversation: Conversation,
       msgId: MessageId): Future[void] {.async.}
 
-
-type KeyEntry* = object
-  keyType: string
-  privateKey: PrivateKey
-  timestamp: int64
-
 type ChatClient* = ref object
   libchatCtx: LibChat 
   ds*: WakuClient
diff --git a/src/chat/crypto/curve25519.nim b/src/chat/crypto/curve25519.nim
deleted file mode 100644
index a197778..0000000
--- a/src/chat/crypto/curve25519.nim
+++ /dev/null
@@ -1,61 +0,0 @@
-# Reference: https://github.com/vacp2p/mix/blob/main/src/curve25519.nim
-
-
-import results
-import bearssl/rand
-import libp2p/crypto/curve25519
-
-const FieldElementSize* = Curve25519KeySize
-
-type FieldElement* = Curve25519Key
-
-# Convert bytes to FieldElement
-proc bytesToFieldElement*(bytes: openArray[byte]): Result[FieldElement, string] =
-  if bytes.len != FieldElementSize:
-    return err("Field element size must be 32 bytes")
-  ok(intoCurve25519Key(bytes))
-
-# Convert FieldElement to bytes
-proc fieldElementToBytes*(fe: FieldElement): seq[byte] =
-  fe.getBytes()
-
-# Generate a random FieldElement
-proc generateRandomFieldElement*(): Result[FieldElement, string] =
-  let rng = HmacDrbgContext.new()
-  if rng.isNil:
-    return err("Failed to creat HmacDrbgContext with system randomness")
-  ok(Curve25519Key.random(rng[]))
-
-# Generate a key pair (private key and public key are both FieldElements)
-proc generateKeyPair*(): Result[tuple[privateKey, publicKey: FieldElement], string] =
-  let privateKeyRes = generateRandomFieldElement()
-  if privateKeyRes.isErr:
-    return err(privateKeyRes.error)
-  let privateKey = privateKeyRes.get()
-
-  let publicKey = public(privateKey)
-  ok((privateKey, publicKey))
-
-# Multiply a given Curve25519 point with a set of scalars
-proc multiplyPointWithScalars*(
-    point: FieldElement, scalars: openArray[FieldElement]
-): FieldElement =
-  var res = point
-  for scalar in scalars:
-    Curve25519.mul(res, scalar)
-  res
-
-# Multiply the Curve25519 base point with a set of scalars
-proc multiplyBasePointWithScalars*(
-    scalars: openArray[FieldElement]
-): Result[FieldElement, string] =
-  if scalars.len <= 0:
-    return err("Atleast one scalar must be provided")
-  var res: FieldElement = public(scalars[0]) # Use the predefined base point
-  for i in 1 ..< scalars.len:
-    Curve25519.mul(res, scalars[i]) # Multiply with each scalar
-  ok(res)
-
-# Compare two FieldElements
-proc compareFieldElements*(a, b: FieldElement): bool =
-  a == b
diff --git a/src/chat/crypto/ecdh.nim b/src/chat/crypto/ecdh.nim
deleted file mode 100644
index 8237fbe..0000000
--- a/src/chat/crypto/ecdh.nim
+++ /dev/null
@@ -1,58 +0,0 @@
-import results
-import libp2p/crypto/curve25519
-import bearssl/rand
-
-import ../utils
-
-type PrivateKey* = object
-  bytes: Curve25519Key
-
-type PublicKey* = distinct Curve25519Key # TODO: define outside of ECDH
-
-
-proc bytes*(key: PublicKey): array[Curve25519KeySize, byte] =
-  cast[array[Curve25519KeySize, byte]](key)
-
-proc get_addr*(pubkey: PublicKey): string =
-    # TODO: Needs Spec
-    result = hash_func(pubkey.bytes().bytesToHex())
-
-
-proc bytes*(key: PrivateKey): Curve25519Key =
-  return key.bytes
-
-
-
-proc createRandomKey*(): Result[PrivateKey, string] =
-  let rng = HmacDrbgContext.new()
-  if rng.isNil:
-    return err("Failed to create HmacDrbgContext with system randomness")
-  ok(PrivateKey(bytes: Curve25519Key.random(rng[])))
-
-proc loadPrivateKeyFromBytes*(bytes: openArray[byte]): Result[PrivateKey, string] =
-  if bytes.len != Curve25519KeySize:
-    return err("Private key size must be 32 bytes")
-  ok(PrivateKey(bytes: intoCurve25519Key(bytes)))
-
-proc loadPublicKeyFromBytes*(bytes: openArray[byte]): Result[PublicKey, string] =
-  if bytes.len != Curve25519KeySize:
-    return err("Public key size must be 32 bytes")
-  ok(PublicKey(intoCurve25519Key(bytes)))
-
-
-proc getPublicKey*(privateKey: PrivateKey): PublicKey =
-  PublicKey( public(privateKey.bytes))
-
-
-proc Dh*(privateKey: PrivateKey, publicKey: PublicKey): Result[seq[
-    byte], string] =
-
-  var outputKey = publicKey.bytes
-  try:
-    Curve25519.mul(outputKey, privateKey.bytes)
-  except CatchableError as e:
-    return err("Failed to compute shared secret: " & e.msg)
-
-  return ok(outputKey.getBytes())
-
-
diff --git a/src/chat/identity.nim b/src/chat/identity.nim
deleted file mode 100644
index 794fcc1..0000000
--- a/src/chat/identity.nim
+++ /dev/null
@@ -1,44 +0,0 @@
-
-import crypto/ecdh
-import results
-import strformat
-import utils
-
-export PublicKey, PrivateKey, loadPrivateKeyFromBytes, loadPublicKeyFromBytes 
-
-
-type
-  Identity* = object
-    name*: string
-    privateKey*: PrivateKey   # TODO: protect key exposure
-
-
-#################################################
-# Constructors
-#################################################
-
-proc createIdentity*(name: string): Identity =
-  let privKey = createRandomKey().get()
-  result = Identity(name: name, privateKey: privKey)
-
-
-#################################################
-# Parameter Access
-#################################################
-
-proc getPubkey*(self: Identity): PublicKey =
-  result = self.privateKey.getPublicKey()
-
-proc getAddr*(self: Identity): string =
-  result = get_addr(self.getPubKey())
-
-proc getName*(self: Identity): string =
-  result = self.name
-
-proc toHex(key: PublicKey): string =
-  bytesToHex(key.bytes())
-
-proc `$`*(key: PublicKey): string =
-  let byteStr = toHex(key)
-  fmt"{byteStr[0..3]}..{byteStr[^4 .. ^1]}"
-
diff --git a/src/chat/types.nim b/src/chat/types.nim
index 3c7544d..37ae838 100644
--- a/src/chat/types.nim
+++ b/src/chat/types.nim
@@ -1,3 +1,4 @@
 type MessageId* = string
 type Content* = seq[byte]
 type ErrorType* = string
+type PublicKey* = array[32, byte]