===> Cleaning for indi-2.0.9