Removed manual references to Deck, Board and Waste.