MASTER: Reduced some redundant classes.