A few cleanup of the indexes