Cleaning up the index