More rule selector cleanup