Convert (and fix) deliverable delete handler
Convert to new delete logic