Remove calibration flag logic