Refactor Catacombs to use Discard Service