Removed DUmmy classes.