[ros-diffs] [gvg] 20772: Clean up