convert to new delete logic