[ros-diffs] [cwittich] 20691: comment out some more not needed code