Variant cleanup