More cleanups for #490 - remove more index grouping code.
Merge pull request #508 from tshort/master

More cleanups for #490 - remove more index grouping code.