Handshake cleanup