Refactor Library to Use Discard Service