Order buses by controller number and remove conflicting "bus number".