Removed unneeded classes and renamed branding