Remove handshake event
Remove handshake event and initiate_handshake so apps don't need to bother about handshaking