[ros-diffs] [cgutman] 36000: - Code cleanup