Finish up moving everything to use ServerInfo for info queries