remove deprecated Service calls