Refactor Market Square to Use Discard Service