Remove extra call to the service