Cleaning up OptionGroup & PricedOptions