diff --git a/cabal.project b/cabal.project
index 0318aa7de4..9f72b40aea 100644
--- a/cabal.project
+++ b/cabal.project
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: b4e55146b8a910add95d0756734ca5ba3f0850fc
+    tag: 8cdd49b91256aee56427f8b8e351cf415045e9c7
 
 source-repository-package
     type: git
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index c4e16fe399..21de83d0ab 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."b4e55146b8a910add95d0756734ca5ba3f0850fc" = "0hwrzn02284myqcv4gdxabk5dw0zisyy13vym5h2k461005jl6sb";
+  "https://github.com/simplex-chat/simplexmq.git"."8cdd49b91256aee56427f8b8e351cf415045e9c7" = "0wgj9ypr6ry414bb15ixyg75cpivwycyh4icy33xm5whksvwy93r";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs
index ec7ac736da..9f24e7007d 100644
--- a/src/Simplex/Chat/Types.hs
+++ b/src/Simplex/Chat/Types.hs
@@ -57,57 +57,6 @@ import Simplex.Messaging.Util (safeDecodeUtf8, (<$?>))
 import Simplex.Messaging.Version
 import Simplex.Messaging.Version.Internal
 
--- TODO PQ replace with actual instances
-instance Eq (ConnectionRequestUri m) where _ == _ = True
-
-instance Eq (APartyCmdTag p) where
-  t1 == t2 = case (t1, t2) of
-    (APCT SAEConn NEW_, APCT SAEConn NEW_) -> True
-    (APCT SAEConn INV_, APCT SAEConn INV_) -> True
-    (APCT SAEConn JOIN_, APCT SAEConn JOIN_) -> True
-    (APCT SAEConn CONF_, APCT SAEConn CONF_) -> True
-    (APCT SAEConn LET_, APCT SAEConn LET_) -> True
-    (APCT SAEConn REQ_, APCT SAEConn REQ_) -> True
-    (APCT SAEConn ACPT_, APCT SAEConn ACPT_) -> True
-    (APCT SAEConn RJCT_, APCT SAEConn RJCT_) -> True
-    (APCT SAEConn INFO_, APCT SAEConn INFO_) -> True
-    (APCT SAEConn CON_, APCT SAEConn CON_) -> True
-    (APCT SAEConn SUB_, APCT SAEConn SUB_) -> True
-    (APCT SAEConn END_, APCT SAEConn END_) -> True
-    (APCT SAENone CONNECT_, APCT SAENone CONNECT_) -> True
-    (APCT SAENone DISCONNECT_, APCT SAENone DISCONNECT_) -> True
-    (APCT SAENone DOWN_, APCT SAENone DOWN_) -> True
-    (APCT SAENone UP_, APCT SAENone UP_) -> True
-    (APCT SAEConn SWITCH_, APCT SAEConn SWITCH_) -> True
-    (APCT SAEConn RSYNC_, APCT SAEConn RSYNC_) -> True
-    (APCT SAEConn SEND_, APCT SAEConn SEND_) -> True
-    (APCT SAEConn MID_, APCT SAEConn MID_) -> True
-    (APCT SAEConn SENT_, APCT SAEConn SENT_) -> True
-    (APCT SAEConn MERR_, APCT SAEConn MERR_) -> True
-    (APCT SAEConn MERRS_, APCT SAEConn MERRS_) -> True
-    (APCT SAEConn MSG_, APCT SAEConn MSG_) -> True
-    (APCT SAEConn MSGNTF_, APCT SAEConn MSGNTF_) -> True
-    (APCT SAEConn ACK_, APCT SAEConn ACK_) -> True
-    (APCT SAEConn RCVD_, APCT SAEConn RCVD_) -> True
-    (APCT SAEConn SWCH_, APCT SAEConn SWCH_) -> True
-    (APCT SAEConn OFF_, APCT SAEConn OFF_) -> True
-    (APCT SAEConn DEL_, APCT SAEConn DEL_) -> True
-    (APCT SAEConn DEL_RCVQ_, APCT SAEConn DEL_RCVQ_) -> True
-    (APCT SAEConn DEL_CONN_, APCT SAEConn DEL_CONN_) -> True
-    (APCT SAENone DEL_USER_, APCT SAENone DEL_USER_) -> True
-    (APCT SAEConn CHK_, APCT SAEConn CHK_) -> True
-    (APCT SAEConn STAT_, APCT SAEConn STAT_) -> True
-    (APCT SAEConn OK_, APCT SAEConn OK_) -> True
-    (APCT SAEConn ERR_, APCT SAEConn ERR_) -> True
-    (APCT SAENone SUSPENDED_, APCT SAENone SUSPENDED_) -> True
-    (APCT SAERcvFile RFDONE_, APCT SAERcvFile RFDONE_) -> True
-    (APCT SAERcvFile RFPROG_, APCT SAERcvFile RFPROG_) -> True
-    (APCT SAERcvFile RFERR_, APCT SAERcvFile RFERR_) -> True
-    (APCT SAESndFile SFPROG_, APCT SAESndFile SFPROG_) -> True
-    (APCT SAESndFile SFDONE_, APCT SAESndFile SFDONE_) -> True
-    (APCT SAESndFile SFERR_, APCT SAESndFile SFERR_) -> True
-    _ -> False
-
 class IsContact a where
   contactId' :: a -> ContactId
   profile' :: a -> LocalProfile