Removed CRM specific parts