Removing useless selection code