Remove redundant code from calibrate