CRM-14367 code tidy ups
CRM-14367 remove unused  & try catch in favour of hard fail (can't think of any cases where soft fail is good