cleaning up donor routes some more