Removed redundant classes
Removed redundant classes
Removed more redundant classes
More pruning