WIP: first cut of removing default index
WIP: more default index stuff