MailChimp updates, cleanup