Cleanup from Customer Calibration changes.