Start removing non-wswan code