Remove orphaned file and cleanup class naming.
Merge pull request #5 from JackDandy/feature/ChangeBrandCleanse

Remove orphaned file and cleanup class naming.