Removed superfluous classes.