[branding] cleanup some branding uses.