Cleanup references to selective checks (#24649)