Remove .client property from service instances