Removed some unused classes.