Moved delete responsibility of Handler to user