Remove redunant with_index