Refactor Delete