remove tricks to make calibration work