sf_cv_constituents cleanup