Final clean up of the index