Refactory to build with WDK and clear proxy stuff