remove handshakeCompletedListener reference in map after handshake