diff --git a/app/services/sets/variant_override_set.rb b/app/services/sets/variant_override_set.rb
index 0e4e90fac2..ffaa04b9fd 100644
--- a/app/services/sets/variant_override_set.rb
+++ b/app/services/sets/variant_override_set.rb
@@ -4,54 +4,26 @@ module Sets
   class VariantOverrideSet < ModelSet
     def initialize(collection, attributes = {})
       @collection_to_delete = []
-
-      super(VariantOverride,
-            collection,
-            attributes,
-            nil,
-            proc { |variant_override| deletable?(variant_override) } )
+      super(VariantOverride, collection, attributes)
     end
 
     protected
 
     def process(variant_override, attributes)
-      variant_override.assign_attributes(attributes.except(:id))
-      if deletable?(variant_override)
-        @collection_to_delete << variant_override
-      else
-        variant_override.assign_attributes(attributes.except(:id))
-      end
+      super
+      @collection_to_delete << variant_override if deletable?(variant_override)
     end
 
     private
 
+    attr_reader :collection_to_delete
+
     def deletable?(variant_override)
       variant_override.deletable? && variant_override.tag_list.empty?
     end
 
-    # Overrides ModelSet method to check presence of a tag_list (which is not an attribute)
-    # This method will delete VariantOverrides that have no values (see deletable? above)
-    #   If the user sets all values to nil in the UI the VO will be deleted from the DB
-    def collection_to_delete
-      deleted = []
-
-      if collection.is_a?(ActiveRecord::Relation)
-        deleted = @collection_to_delete
-      else
-        collection.delete_if do |variant_override|
-          deleted << variant_override if @delete_if.andand.call(variant_override)
-        end
-      end
-
-      deleted
-    end
-
     def collection_to_keep
-      if collection.is_a?(ActiveRecord::Relation)
-        collection - @collection_to_delete
-      else
-        collection.reject { |e| @delete_if.andand.call(e.attributes, e.tag_list) }
-      end
+      collection - @collection_to_delete
     end
   end
 end