Cleanup model service class. Fix new service definition class.