Remove reliance on email and API keys for server information