[ros-diffs] [tkreuzer] 36522: Some cleanup