Trainer calibration cleanup