More work/cleanup
Updating to current mongodb index structure