service implementation cleaned of old code