Calibration cleanup

Reduced unnecessary code