CRM-13793 code cleanup
Merge pull request #1 from JoeMurray/CRM-13793

CRM-13793 code cleanup