Refactor Saboteur to Use Discard Service