remove_cv fix