refactoring deferred-deletion handling
Trying to tweak v1 of deferred-deletes to work better on slow systems