more INDI cleanup