Removed redundant classes