sf_cv_constituents clean up