Removed some deprecated classes.