Changes to deletion process