Refactor Delete Handler