Removed old index generation