WIP: more work removing default index