INTERNAL: remoded redundant classes.