Refactor Sage to Use Discard Service