Remove obsolete handshake detectors