More removing calibration dependency