MASTER: Cleaned up some redundant classes.