remove gift index as composite not needed