removed excessive copies of primary index