Deletion improvements