Fixed index removal