Remove some VariantData reference