fix email template and remove comment