REmoved redundant classes.