added handshake validation
deleted unnecessary deps