RouteProvider refactor cleanup