[ros-diffs] [cwittich] 39495: get rid of some junk