stop using legacy indexes

tests don't seem to need this (are we missing some test coverage?)