[ros-diffs] [khornicek] 36765: - remove dead code, fixes CID 60, CID 61