Final changes to deletion