===> Cleaning for indi-2.1.0