-- CRM-12762 removed unwanted comments