Uncommented out ServerLocator code