major refactoring, removed brands