[ros-diffs] [cgutman] 45349: - Remove some unused junk code