===> Cleaning for ii-1.8