make index cleanup more generic
OTS: Bruno
TESTED: removed old indexes on production