Removed ComboEnumControlBuilder in favor of ComboControlBuilder