CRM-14978 related cleanup