===> Cleaning for indi-2.2.0