Remove unneeded index fields for boms and stacks