Improved deleting