Magic documentation cleanup
Calibrator cleanup