CRM-12305 - Remove eval functions to tidy up code base
remove trailing whitespaces