[ros-diffs] [cgutman] 39924: - Remove some redundant code