removed hard coded service providers