Get rid of first call to astrometry in calibrate task - Remove CR from sources used by astrometry