remove GeneralCombiner as it's not used anyway