Removed some donation classes.
Fix merge conflicts.