Refactor/change discard to waste