Cleaning up time calibration code for new servers.