[ros-diffs] [fireball] 34643: - Cleanup the branch from unneeded components.