stop using legacy indexes

nice that all this disappears :smile: