diff --git a/SarInstaller/Product.wxs b/SarInstaller/Product.wxs
index 935fec6..df6ce77 100644
--- a/SarInstaller/Product.wxs
+++ b/SarInstaller/Product.wxs
@@ -29,10 +29,8 @@
 		<Feature Id="Main" Title="Synchronous Audio Router" Level="1">
       <?if $(var.Platform) = x64 ?>
         <ComponentRef Id="KsDriver64"/>
-        <ComponentRef Id="NdisDriver64"/>
       <?else ?>
         <ComponentRef Id="KsDriver32"/>
-        <ComponentRef Id="NdisDriver32"/>
       <?endif ?>
 
       <?if $(var.Platform) = x64 ?>
@@ -65,28 +63,12 @@
                   Execute="deferred"
                   Impersonate="no"
                   Return="check"/>
-    <!--
-    <CustomAction Id="InstallNdisFilter"
-                  BinaryKey="SarInstallerActions"
-                  DllEntry="InstallNdisFilter"
-                  Execute="deferred"
-                  Impersonate="no"
-                  Return="check"/>
-                  -->
     <CustomAction Id="RemoveDeviceNode"
                   BinaryKey="SarInstallerActions"
                   DllEntry="RemoveDeviceNode"
                   Execute="deferred"
                   Impersonate="no"
                   Return="check"/>
-    <!--
-    <CustomAction Id="UninstallNdisFilter"
-              BinaryKey="SarInstallerActions"
-              DllEntry="UninstallNdisFilter"
-              Execute="deferred"
-              Impersonate="no"
-              Return="check"/>
-              -->
 
     <InstallExecuteSequence>
       <Custom Action="CreateDeviceNode.SetProperty" After="InstallFiles">
@@ -95,14 +77,6 @@
       <Custom Action="CreateDeviceNode" After="CreateDeviceNode.SetProperty">
         NOT Installed AND NOT REMOVE
       </Custom>
-      <!-- Disabled until NDIS driver is mature.
-      <Custom Action="InstallNdisFilter" After="MsiProcessDrivers">
-        NOT Installed AND NOT REMOVE
-      </Custom>
-      <Custom Action="UninstallNdisFilter" Before="MsiProcessDrivers">
-        REMOVE
-      </Custom>
-      -->
       <Custom Action="RemoveDeviceNode" Before="RemoveFiles">
         REMOVE
       </Custom>
@@ -140,26 +114,6 @@
         <difx:Driver PlugAndPlayPrompt="no"/>
       </Component>
 
-      <Directory Id="SarNdisDir" Name="SarNdis">
-          <Component Id="NdisDriver64"
-              Guid="{9E1CA92F-732B-4AFF-BFF4-3AAE349B9E8F}"
-              Win64="yes">
-          <File Id="SarNdis.sys"
-                Name="SarNdis.sys"
-                Source="..\x64\Release\SarNdis.sys"
-                KeyPath="yes"/>
-          <File Id="SarNdis.cat"
-                Name="SarNdis.cat"
-                Source="..\x64\Release\SarNdis\SarNdis.cat"
-                KeyPath="no"/>
-          <File Id="SarNdis.inf"
-                Name="SarNdis.inf"
-                Source="..\x64\Release\SarNdis\SarNdis.inf"
-                KeyPath="no"/>
-          <difx:Driver PlugAndPlayPrompt="no"/>
-        </Component>
-      </Directory>
-
       <Component Id="AsioDriver64"
                  Guid="{2EE1A63F-AEB4-4518-A3FD-963A67CAA5DA}"
                  Win64="yes">
@@ -313,26 +267,6 @@
         <difx:Driver PlugAndPlayPrompt="no"/>
       </Component>
 
-      <Directory Id="SarNdisDir" Name="SarNdis">
-        <Component Id="NdisDriver32"
-             Guid="{9E1CA92F-732B-4AFF-BFF4-3AAE349B9E8F}"
-             Win64="no">
-          <File Id="SarNdis.sys"
-                Name="SarNdis.sys"
-                Source="..\Release\SarNdis.sys"
-                KeyPath="yes"/>
-          <File Id="SarNdis.cat"
-                Name="SarNdis.cat"
-                Source="..\Release\SarNdis\SarNdis.cat"
-                KeyPath="no"/>
-          <File Id="SarNdis.inf"
-                Name="SarNdis.inf"
-                Source="..\Release\SarNdis\SarNdis.inf"
-                KeyPath="no"/>
-          <difx:Driver PlugAndPlayPrompt="no"/>
-        </Component>
-      </Directory>
-
       <Component Id="AsioDriver32"
            Guid="{FFBEFDDB-FBC6-4CE5-9187-267DE9BB93D9}"
            Win64="no">