Waste code cleanup