fixed up handshake detector and removed unnecessary files