Refactor Secret Chamber to Use Discard Service