Deletes now done first in batch
Changes to how UnitOfScope works