[ros-diffs] [cgutman] 36364: - Remove more useless code