Cleans up calibration runs
Update fig_jk for new data format