Eliminate the 3rd feature.

The feature trying to tolerate non-perpendicular sticks is not robust.
Return to previously version with feature 1 and feature 2 still added.