Improved handling of deletes