Finish removing references to index.