Removes usage of CustomVariants.