[ros-diffs] [cgutman] 40908: - Remove some extra junk