Cleared out more overqualified selectors