More calibration clean up.