OPAL-1864 Restriction on the set of entities removed.