Remove some old stuff from the mailer