CRM-14978 related cleanup
Merge pull request #4218 from colemanw/CRM-14978

CRM-14978 related cleanup