CRM-12305 further eval removal