index clean up phase 2