[ros-diffs] [gschneider] 37413: Remove old locations