Modified delete workflow to prevent incomplete deletes.