[ros-diffs] [sginsberg] 35410: - Remove dead code