upgrade for new mailer and remove some bad console.logs;