Complete safe-delete functionality