diff --git a/gajim/common/connection.py b/gajim/common/connection.py
index be22fd603..f36d4124d 100644
--- a/gajim/common/connection.py
+++ b/gajim/common/connection.py
@@ -121,10 +121,6 @@ class CommonConnection:
 
         # Remember where we are in the register agent process
         self.agent_registrations = {}
-        # To know the groupchat jid associated with a stanza ID. Useful to
-        # request vcard or os info... to a real JID but act as if it comes from
-        # the fake jid
-        self.groupchat_jids = {} # {ID : groupchat_jid}
 
         self.roster_supported = True
         self.addressing_supported = False
diff --git a/gajim/common/connection_handlers.py b/gajim/common/connection_handlers.py
index 9baa6a60d..880252ed2 100644
--- a/gajim/common/connection_handlers.py
+++ b/gajim/common/connection_handlers.py
@@ -56,9 +56,6 @@ class ConnectionHandlersBase:
         # IDs of sent messages (https://trac.gajim.org/ticket/8222)
         self.sent_message_ids = []
 
-        # We decrypt GPG messages one after the other. Keep queue in mem
-        self.gpg_messages_to_decrypt = []
-
         app.ged.register_event_handler('gc-message-received', ged.CORE,
             self._nec_gc_message_received)
 
@@ -256,15 +253,10 @@ class ConnectionHandlers(ConnectionSocks5Bytestream,
     def __init__(self):
         ConnectionSocks5Bytestream.__init__(self)
         ConnectionIBBytestream.__init__(self)
-
-        # Handle presences BEFORE caps
-        app.nec.register_incoming_event(PresenceReceivedEvent)
-
         ConnectionJingle.__init__(self)
         ConnectionHandlersBase.__init__(self)
 
-        self.continue_connect_info = None
-
+        app.nec.register_incoming_event(PresenceReceivedEvent)
         app.nec.register_incoming_event(StreamConflictReceivedEvent)
         app.nec.register_incoming_event(NotificationEvent)