Thanks for getting rid of these classes.