Fix ComboComponentBuilder, remove ComboEnumComponentBuilder