Elliminating all calibrate references (obsoleted by calibrator)