Removed Tenant email fields, redundant with EmailServer and not used anyway (ie in sendEmailTemplate.groovy)