CRM-14327 - Cleanup custom delete links
Merge pull request #2773 from colemanw/custom

CRM-14327 - Cleanup custom delete links