Cleaning up demand and adding TrafficClass