diff --git a/IISExpress/AppServer/applicationhost.config b/IISExpress/AppServer/applicationhost.config
index 458aeedbb..c0086b307 100644
--- a/IISExpress/AppServer/applicationhost.config
+++ b/IISExpress/AppServer/applicationhost.config
@@ -59,21 +59,16 @@
     <sectionGroup name="system.webServer">
       <section name="asp" overrideModeDefault="Deny" />
       <section name="caching" overrideModeDefault="Allow" />
-      <section name="cgi" overrideModeDefault="Deny" />
       <section name="defaultDocument" overrideModeDefault="Allow" />
       <section name="directoryBrowse" overrideModeDefault="Allow" />
-      <section name="fastCgi" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
       <section name="globalModules" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
       <section name="handlers" overrideModeDefault="Deny" />
       <section name="httpCompression" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
       <section name="httpErrors" overrideModeDefault="Allow" />
-      <section name="httpLogging" overrideModeDefault="Deny" />
       <section name="httpProtocol" overrideModeDefault="Allow" />
       <section name="httpRedirect" overrideModeDefault="Allow" />
       <section name="httpTracing" overrideModeDefault="Deny" />
-      <section name="isapiFilters" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
       <section name="modules" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
-      <section name="odbcLogging" overrideModeDefault="Deny" />
       <sectionGroup name="security">
         <section name="access" overrideModeDefault="Deny" />
         <section name="applicationDependencies" overrideModeDefault="Deny" />
@@ -87,7 +82,6 @@
         </sectionGroup>
         <section name="authorization" overrideModeDefault="Allow" />
         <section name="ipSecurity" overrideModeDefault="Deny" />
-        <section name="isapiCgiRestriction" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
         <section name="requestFiltering" overrideModeDefault="Allow" />
       </sectionGroup>
       <section name="serverRuntime" overrideModeDefault="Deny" />
@@ -160,7 +154,6 @@
       <limits />
     </asp>
     <caching enabled="true" enableKernelCache="true"></caching>
-    <cgi />
     <defaultDocument enabled="true">
       <files>
         <add value="Default.htm" />
@@ -171,7 +164,6 @@
       </files>
     </defaultDocument>
     <directoryBrowse enabled="false" />
-    <fastCgi />
     <!--
 
           The <globalModules> section defines all native-code modules.
@@ -200,16 +192,10 @@
       <add name="IISCertificateMappingAuthenticationModule" image="%IIS_BIN%\authmap.dll" />
       <add name="IpRestrictionModule" image="%IIS_BIN%\iprestr.dll" />
       <add name="RequestFilteringModule" image="%IIS_BIN%\modrqflt.dll" />
-      <add name="CustomLoggingModule" image="%IIS_BIN%\logcust.dll" />
       <add name="CustomErrorModule" image="%IIS_BIN%\custerr.dll" />
-      <add name="HttpLoggingModule" image="%IIS_BIN%\loghttp.dll" />
       <!--            <add name="TracingModule" image="%IIS_BIN%\iisetw.dll" /> -->
       <add name="FailedRequestsTracingModule" image="%IIS_BIN%\iisfreb.dll" />
       <add name="RequestMonitorModule" image="%IIS_BIN%\iisreqs.dll" />
-      <add name="IsapiModule" image="%IIS_BIN%\isapi.dll" />
-      <add name="IsapiFilterModule" image="%IIS_BIN%\filter.dll" />
-      <add name="CgiModule" image="%IIS_BIN%\cgi.dll" />
-      <add name="FastCgiModule" image="%IIS_BIN%\iisfcgi.dll" />
       <!--            <add name="WebDAVModule" image="%IIS_BIN%\webdav.dll" /> -->
       <add name="RewriteModule" image="%IIS_BIN%\rewrite.dll" />
       <add name="ConfigurationValidationModule" image="%IIS_BIN%\validcfg.dll" />
@@ -245,7 +231,6 @@
       <error statusCode="501" prefixLanguageFilePath="%IIS_BIN%\custerr" path="501.htm" />
       <error statusCode="502" prefixLanguageFilePath="%IIS_BIN%\custerr" path="502.htm" />
     </httpErrors>
-    <httpLogging dontLog="false" />
     <httpProtocol>
       <customHeaders>
         <clear />
@@ -257,12 +242,6 @@
     </httpProtocol>
     <httpRedirect enabled="false" />
     <httpTracing></httpTracing>
-    <isapiFilters>
-      <filter name="ASP.Net_2.0.50727.0" path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="bitness32,runtimeVersionv2.0" />
-      <filter name="ASP.Net_2.0_for_v1.1" path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="runtimeVersionv1.1" />
-      <filter name="ASP.Net_4.0_32bit" path="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_filter.dll" enableCache="true" preCondition="bitness32,runtimeVersionv4.0" />
-    </isapiFilters>
-    <odbcLogging />
     <security>
       <access sslFlags="None" />
       <applicationDependencies>
@@ -285,9 +264,6 @@
         <add accessType="Allow" users="*" />
       </authorization>
       <ipSecurity allowUnlisted="true" />
-      <isapiCgiRestriction notListedIsapisAllowed="true" notListedCgisAllowed="true">
-        <add path="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" allowed="true" groupId="ASP.NET_v4.0" description="ASP.NET_v4.0" />
-      </isapiCgiRestriction>
       <requestFiltering>
         <fileExtensions allowUnlisted="true" applyToWebDAV="true">
           <add fileExtension=".asa" allowed="false" />
@@ -706,13 +682,11 @@
             <add name="Security" value="4" />
             <add name="Filter" value="8" />
             <add name="StaticFile" value="16" />
-            <add name="CGI" value="32" />
             <add name="Compression" value="64" />
             <add name="Cache" value="128" />
             <add name="RequestNotifications" value="256" />
             <add name="Module" value="512" />
             <add name="Rewrite" value="1024" />
-            <add name="FastCGI" value="4096" />
           </areas>
         </add>
         <add name="ASP" guid="{06b94d9a-b15e-456e-a4ef-37c984a2cb4b}">
@@ -720,11 +694,6 @@
             <clear />
           </areas>
         </add>
-        <add name="ISAPI Extension" guid="{a1c2040e-8840-4c31-ba11-9871031a19ea}">
-          <areas>
-            <clear />
-          </areas>
-        </add>
         <add name="ASPNET" guid="{AFF081FE-0247-4275-9C4E-021F3DC1DA35}">
           <areas>
             <add name="Infrastructure" value="1" />
@@ -739,8 +708,6 @@
           <traceAreas>
             <add provider="ASP" verbosity="Verbose" />
             <add provider="ASPNET" areas="Infrastructure,Module,Page,AppServices" verbosity="Verbose" />
-            <add provider="ISAPI Extension" verbosity="Verbose" />
-            <add provider="WWW Server" areas="Authentication,Security,Filter,StaticFile,CGI,Compression,Cache,RequestNotifications,Module,Rewrite" verbosity="Verbose" />
           </traceAreas>
           <failureDefinitions statusCodes="200-999" />
         </add>
@@ -773,7 +740,6 @@
         <add name="StaticCompressionModule" lockItem="true" />
         <add name="DefaultDocumentModule" lockItem="true" />
         <add name="DirectoryListingModule" lockItem="true" />
-        <add name="IsapiFilterModule" lockItem="true" />
         <add name="ProtocolSupportModule" lockItem="true" />
         <add name="HttpRedirectionModule" lockItem="true" />
         <add name="ServerSideIncludeModule" lockItem="true" />
@@ -789,13 +755,8 @@
         <add name="IISCertificateMappingAuthenticationModule" lockItem="true" />
         <add name="IpRestrictionModule" lockItem="true" />
         <add name="RequestFilteringModule" lockItem="true" />
-        <add name="CustomLoggingModule" lockItem="true" />
         <add name="CustomErrorModule" lockItem="true" />
-        <add name="IsapiModule" lockItem="true" />
-        <add name="HttpLoggingModule" lockItem="true" />
         <add name="FailedRequestsTracingModule" lockItem="true" />
-        <add name="CgiModule" lockItem="true" />
-        <add name="FastCgiModule" lockItem="true" />
         <!--                <add name="WebDAVModule" /> -->
         <add name="RewriteModule" />
         <add name="ConfigurationValidationModule" lockItem="true" />
@@ -819,26 +780,7 @@
       <handlers accessPolicy="Read, Script">
         <!--                <add name="WebDAV" path="*" verb="PROPFIND,PROPPATCH,MKCOL,PUT,COPY,DELETE,MOVE,LOCK,UNLOCK" modules="WebDAVModule" resourceType="Unspecified" requireAccess="None" /> -->
         <add name="svc-Integrated" path="*.svc" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="svc-ISAPI-2.0" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" />
         <add name="xoml-Integrated" path="*.xoml" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="xoml-ISAPI-2.0" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" />
-        <add name="rules-Integrated" path="*.rules" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="rules-ISAPI-2.0" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" />
-        <add name="AXD-ISAPI-4.0_32bit" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="PageHandlerFactory-ISAPI-4.0_32bit" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="SimpleHandlerFactory-ISAPI-4.0_32bit" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="WebServiceHandlerFactory-ISAPI-4.0_32bit" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-rem-ISAPI-4.0_32bit" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-soap-ISAPI-4.0_32bit" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="svc-ISAPI-4.0_32bit" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="rules-ISAPI-4.0_32bit" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="xoml-ISAPI-4.0_32bit" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="xamlx-ISAPI-4.0_32bit" path="*.xamlx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="aspq-ISAPI-4.0_32bit" path="*.aspq" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="cshtm-ISAPI-4.0_32bit" path="*.cshtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="cshtml-ISAPI-4.0_32bit" path="*.cshtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="vbhtm-ISAPI-4.0_32bit" path="*.vbhtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="vbhtml-ISAPI-4.0_32bit" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
         <add name="TraceHandler-Integrated-4.0" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode,runtimeVersionv4.0" />
         <add name="WebAdminHandler-Integrated-4.0" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode,runtimeVersionv4.0" />
         <add name="AssemblyResourceLoader-Integrated-4.0" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode,runtimeVersionv4.0" />
@@ -858,9 +800,6 @@
         <add name="vbhtml-Integrated-4.0" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
         <add name="ScriptHandlerFactoryAppServices-Integrated-4.0" path="*_AppService.axd" verb="*" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" />
         <add name="ScriptResourceIntegrated-4.0" path="ScriptResource.axd" verb="GET,HEAD" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" />
-        <!--                <add name="ASPClassic" path="*.asp" verb="GET,HEAD,POST" modules="IsapiModule" scriptProcessor="%IIS_BIN%\asp.dll" resourceType="File" />-->
-        <!--                <add name="SecurityCertificate" path="*.cer" verb="GET,HEAD,POST" modules="IsapiModule" scriptProcessor="%IIS_BIN%\asp.dll" resourceType="File" />-->
-        <add name="ISAPI-dll" path="*.dll" verb="*" modules="IsapiModule" resourceType="File" requireAccess="Execute" allowPathInfo="true" />
         <add name="TraceHandler-Integrated" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode" />
         <add name="WebAdminHandler-Integrated" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode" />
         <add name="AssemblyResourceLoader-Integrated" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode" />
@@ -869,19 +808,11 @@
         <add name="WebServiceHandlerFactory-Integrated" path="*.asmx" verb="GET,HEAD,POST,DEBUG" type="System.Web.Services.Protocols.WebServiceHandlerFactory,System.Web.Services,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b03f5f7f11d50a3a" preCondition="integratedMode,runtimeVersionv2.0" />
         <add name="HttpRemotingHandlerFactory-rem-Integrated" path="*.rem" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
         <add name="HttpRemotingHandlerFactory-soap-Integrated" path="*.soap" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="AXD-ISAPI-2.0" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="PageHandlerFactory-ISAPI-2.0" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="SimpleHandlerFactory-ISAPI-2.0" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="WebServiceHandlerFactory-ISAPI-2.0" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-rem-ISAPI-2.0" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-soap-ISAPI-2.0" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="CGI-exe" path="*.exe" verb="*" modules="CgiModule" resourceType="File" requireAccess="Execute" allowPathInfo="true" />
         <add name="SSINC-stm" path="*.stm" verb="GET,POST" modules="ServerSideIncludeModule" resourceType="File" />
         <add name="SSINC-shtm" path="*.shtm" verb="GET,POST" modules="ServerSideIncludeModule" resourceType="File" />
         <add name="SSINC-shtml" path="*.shtml" verb="GET,POST" modules="ServerSideIncludeModule" resourceType="File" />
         <add name="TRACEVerbHandler" path="*" verb="TRACE" modules="ProtocolSupportModule" requireAccess="None" />
         <add name="OPTIONSVerbHandler" path="*" verb="OPTIONS" modules="ProtocolSupportModule" requireAccess="None" />
-        <add name="ExtensionlessUrl-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
         <add name="ExtensionlessUrl-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
         <add name="StaticFile" path="*" verb="*" modules="StaticFileModule,DefaultDocumentModule,DirectoryListingModule" resourceType="Either" requireAccess="Read" />
       </handlers>
diff --git a/IISExpress/cgi.dll b/IISExpress/cgi.dll
deleted file mode 100644
index 9317434b7..000000000
Binary files a/IISExpress/cgi.dll and /dev/null differ
diff --git a/IISExpress/filter.dll b/IISExpress/filter.dll
deleted file mode 100644
index b86d8f871..000000000
Binary files a/IISExpress/filter.dll and /dev/null differ
diff --git a/IISExpress/isapi.dll b/IISExpress/isapi.dll
deleted file mode 100644
index c9dd5f7a0..000000000
Binary files a/IISExpress/isapi.dll and /dev/null differ