Merge "TrafficController - remove dead code" into main