===> Cleaning for vv-3.1