Refactor Knights to Use Discard Service