Clean up some of the use import classes.