CRM-17507 - Cleanup settings setItem calls