more cleanup for CtagCalibration