[ros-diffs] [cgutman] 40259: - Remove some unnecessary code