===> Cleaning for ii-2.0