Removed waiting for handshake back