Add logger, cleanup mailer