Cleanup of layer 2 sequence detection: get rid of some experimental classes