Some clean up in the index file