Integrated Nico's updates for better deletes