New index, removed old code