More TransitDataService Removal Cleanup