Remove CtrlPoint and Segment; move relevant data to Yarn