Removed unnecessary calibration crud.