Cleanups relating to the switch to item_groups.json