Remove references to serviceName