remove more with_index calls