First steps in removing some of the old and deprecated index
infrastructure. The biggest challenge is that many of the tests still
use the old index styles