Removing more unused classes.