Large-scale simplication, but Charity.find_by_name() now uncooperative