Removed donor system and some other stuff