refactor: removing class ServiceNameResolver, cleaning up lamba exps