Remove singleton from ServerInfo since we'll need more of those now