[ros-diffs] [mf] 18514: remove some unused special handling code and comments