Some updates to branding, cleanup is neeed.