Remove reference to secondary-indexes