Refactor / exclude dry goods from waste count