Variant removal options added for comparison.

Sticking with removing invalid and finished in one go at the beginning
of update() for now.