Remove link to custom mapper
Add donor