Adjust to new constructor for ConditionalRemoval