Remove bypass_alt and bypass_prev.

They are kept on an experimental branch for potential future testing,
but the current bypass should be stable and passes all tests.