removed redundant classes