Remove SMTP, and some Windows types