Removed several unused classes.