include spatial variation for faint source PSF cutout, other clean-up