Remove more non-wswan code