This removes UUID Resolver and Deprecates it