===> Cleaning for nvi2-2.2.0