Clean up some dead code
More dead code cleanup
Refactor away from matching, towards selecting