Further clean up resource handling in TrainViewService, TransitViewService