Cleanup for CV count