removing handshake call since we don't use it anymore