Removed some useless and redundant classes.