Removed redundant classes
Removed more redundant classes