Remove handshake spec