removing more mailer stuff