Refactory to build with WDK and disable proxy