Cleanup remaining references to SegmentedControl