More index clean up