Migrate to catkin simple

rm