tidy up before changing git from catkin_workspace to module...