variant cleanup