cleanup and update to use new Branding library.