remove dependency on secondary index; remove comments referencing
secondary index