Removed various unused classes.