(Rice) Narann Backport - Remove GeneralCombiner as it's not used anyway