CRM-12619 - per comment remove obsolete variables