Remove FareBuilder and SegmentBuilder from the core