Cleaning up some class usage.