Got rid of duplicate classes.