Removing TransitService for simplicity