diff --git a/SessionUtilitiesKit/Database/Models/Identity.swift b/SessionUtilitiesKit/Database/Models/Identity.swift
index 3e55ee0a3..67b3eabf7 100644
--- a/SessionUtilitiesKit/Database/Models/Identity.swift
+++ b/SessionUtilitiesKit/Database/Models/Identity.swift
@@ -111,11 +111,9 @@ public extension Identity {
         }
     }
     
-    // TODO: Should this actually clear all identity values???
     static func clearUserKeyPair() {
         GRDBStorage.shared.write { db in
-            try Identity.deleteOne(db, id: .x25519PublicKey)
-            try Identity.deleteOne(db, id: .x25519PrivateKey)
+            try Identity.deleteAll(db)
         }
     }
 }