Improvements and fixes to deletion changes.