Removed redundant classes.