diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
deleted file mode 100644
index 422797f2..00000000
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-  <configSections>
-    <section name="microsoft.web.services3" type="Microsoft.Web.Services3.Configuration.WebServicesConfiguration, Microsoft.Web.Services3"/>
-  </configSections>
-  <!-- Connection strings -->
-  <connectionStrings>
-        <add name="EnterpriseServer" connectionString="server=2012PROV01;database=WebsitePanel;uid=WebsitePanel;pwd=5qc7ftf6q42byc08z857;" providerName="System.Data.SqlClient" />
-  </connectionStrings>
-  <appSettings>
-    <!-- Encryption util settings -->
-   <add key="WebsitePanel.CryptoKey" value="fbd61z4gwsc2m01x7xn2" />
-    <!-- A1D4KDHUE83NKHddF -->
-    <add key="WebsitePanel.EncryptionEnabled" value="true"/>
-    <!-- Web Applications -->
-    <add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications"/>
-    <!-- Communication settings -->
-    <!-- Maximum waiting time when sending request to the remote server
-         The value is in seconds. "-1" - infinite. -->
-    <add key="WebsitePanel.EnterpriseServer.ServerRequestTimeout" value="3600"/>
-    <add key="WebsitePanel.AltConnectionString" value="ConnectionString"/>
-    <add key="WebsitePanel.AltCryptoKey" value="CryptoKey"/>
-  </appSettings>
-  <system.web>
-    <!-- Disable any authentication -->
-    <authentication mode="None"/>
-    <!-- Correct HTTP runtime settings -->
-    <httpRuntime executionTimeout="3600" maxRequestLength="16384"/>
-    <!-- Set globalization settings -->
-    <globalization culture="en-US" uiCulture="en" requestEncoding="UTF-8" responseEncoding="UTF-8" fileEncoding="UTF-8"/>
-    <!-- Web Services settings -->
-    <webServices>
-      <protocols>
-        <remove name="HttpPost"/>
-        <remove name="HttpPostLocalhost"/>
-        <remove name="HttpGet"/>
-      </protocols>
-      <soapServerProtocolFactory type="Microsoft.Web.Services3.WseProtocolFactory, Microsoft.Web.Services3"/>
-    </webServices>
-    <compilation targetFramework="4.0" debug="true"/>
-  </system.web>
-  <!-- WSE 3.0 settings -->
-  <microsoft.web.services3>
-    <diagnostics>
-      <trace enabled="false" input="InputTrace.webinfo" output="OutputTrace.webinfo"/>
-    </diagnostics>
-    <messaging>
-      <maxMessageLength value="-1"/>
-      <mtom clientMode="On"/>
-    </messaging>
-    <security>
-      <securityTokenManager>
-        <add type="WebsitePanel.EnterpriseServer.ServiceUsernameTokenManager, WebsitePanel.EnterpriseServer.Code" namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" localName="UsernameToken"/>
-      </securityTokenManager>
-    </security>
-    <policy fileName="WsePolicyCache.Config"/>
-  </microsoft.web.services3>
-</configuration>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/SiteSettings.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/SiteSettings.config
deleted file mode 100644
index 4fc71ff6..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/SiteSettings.config
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<SiteSettings>
-	<!-- Display Settings -->
-	<PortalName>WebsitePanel</PortalName>
-	<!-- Enterprise Server -->
-	<EnterpriseServer>http://localhost:9002</EnterpriseServer>
-	<!-- General Settings -->
-	<CultureCookieName>UserCulture</CultureCookieName>
-	<ThemeCookieName>UserTheme</ThemeCookieName>
-	<!-- Mail Settings -->
-	<AdminEmail>
-	</AdminEmail>
-	<SmtpHost>
-	</SmtpHost>
-	<SmtpPort>
-	</SmtpPort>
-	<SmtpUsername>
-	</SmtpUsername>
-	<SmtpPassword>
-	</SmtpPassword>
-	<FromEmail>
-	</FromEmail>
-	<!-- Pages -->
-	<DefaultPage>Home</DefaultPage>
-	<LoginPage>Login</LoginPage>
-	<UserHomePage>Home</UserHomePage>
-	<UserCustomersPage>UserCustomers</UserCustomersPage>
-	<SpaceHomePage>SpaceHome</SpaceHomePage>
-	<NestedSpacesPage>NestedSpaces</NestedSpacesPage>
-	<UsersSearchPage>SearchUsers</UsersSearchPage>
-	<SpacesSearchPage>SearchSpaces</SpacesSearchPage>
-	<LoggedUserAccountPage>LoggedUserDetails</LoggedUserAccountPage>
-	<!-- Skins and Containers -->
-	<PortalSkin>Browse2.ascx</PortalSkin>
-	<PortalContainer>Browse.ascx</PortalContainer>
-	<AdminSkin>Edit.ascx</AdminSkin>
-	<AdminContainer>Edit.ascx</AdminContainer>
-	<!-- SSL Settings -->
-	<UseSSL>false</UseSSL>
-  <HideDemoCheckbox>false</HideDemoCheckbox>
-  <HideThemeAndLocale>false</HideThemeAndLocale>
-  <ExcludedRolesToLogin></ExcludedRolesToLogin>
-</SiteSettings>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/Web.config
deleted file mode 100644
index 497e9620..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/Web.config
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-	<appSettings>
-		<add key="WebPortal.ThemeProvider" value="WebsitePanel.Portal.WebPortalThemeProvider, WebsitePanel.Portal.Modules"/>
-		<add key="WebPortal.PageTitleProvider" value="WebsitePanel.Portal.WebPortalPageTitleProvider, WebsitePanel.Portal.Modules"/>
-		<add key="ChartImageHandler" value="storage=file;timeout=20;" />
-		<add key="SessionValidationKey" value="DAD46D476F85E0198BCA134D7AA5CC1D7" />
-	</appSettings>
-	<system.web>    
-		<!-- SiteMap settings -->
-		<siteMap defaultProvider="WebsitePanelSiteMapProvider" enabled="true">
-			<providers>
-				<add name="WebsitePanelSiteMapProvider" type="WebsitePanel.WebPortal.WebsitePanelSiteMapProvider, WebsitePanel.WebPortal" securityTrimmingEnabled="true"/>
-			</providers>
-		</siteMap>
-		<!-- Set default scheme -->
-		<pages theme="Default" validateRequest="false" controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-			<controls>
-				<add tagPrefix="ajaxToolkit" namespace="AjaxControlToolkit" assembly="AjaxControlToolkit"/>
-			</controls>
-		</pages>
-		<!-- Maximum size of uploaded file, in MB -->
-		<httpRuntime executionTimeout="1800" requestValidationMode="2.0" maxRequestLength="16384" enableVersionHeader="false" />
-		<!--
-          ASMX is mapped to a new handler so that proxy javascripts can also be served.
-    -->
-		<httpHandlers>
-			<add verb="*" path="Reserved.ReportViewerWebControl.axd" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" validate="false"/>
-		</httpHandlers>
-		<!-- Authentication -->
-		<authentication mode="Forms">
-			<forms name=".WEBSITEPANELPORTALAUTHASPX" protection="All" timeout="30" path="/" requireSSL="false" slidingExpiration="true" cookieless="UseDeviceProfile" domain="" enableCrossAppRedirects="false">
-			</forms>
-		</authentication>
-		<!-- Custom errors -->
-		<customErrors mode="RemoteOnly" defaultRedirect="~/error.htm"/>
-		<!-- Default authorization settings -->
-		<authorization>
-			<allow users="*"/>
-		</authorization>
-		<!-- Globalization settings -->
-		<globalization culture="auto:en-US" uiCulture="auto:en" requestEncoding="UTF-8" responseEncoding="UTF-8"></globalization>
-		<compilation debug="true" targetFramework="4.0">
-		</compilation>
-	</system.web>
-	<system.webServer>
-		<validation validateIntegratedModeConfiguration="false"/>
-		<handlers>
-			<add name="ChartImg" path="ChartImg.axd" verb="GET,HEAD,POST" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" resourceType="Unspecified" preCondition="integratedMode" />
-		</handlers>
-		<modules>
-			<add name="SecureSession" type="WebsitePanel.WebPortal.SecureSessionModule" />
-		</modules>
-  </system.webServer>
-</configuration>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/generate_server_proxies.bat b/WebsitePanel/Sources/generate_server_proxies.bat
deleted file mode 100644
index 2285c727..00000000
--- a/WebsitePanel/Sources/generate_server_proxies.bat
+++ /dev/null
@@ -1,69 +0,0 @@
-SET WSDL="C:\Program Files (x86)\Microsoft WSE\v3.0\Tools\WseWsdl3.exe"
-SET WSE_CLEAN=..\Tools\WseClean.exe
-SET SERVER_URL=http://localhost:9003
-
-REM %WSDL% %SERVER_URL%/AutoDiscovery.asmx /out:.\WebsitePanel.Server.Client\AutoDiscoveryProxy.cs /namespace:WebsitePanel.AutoDiscovery /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\AutoDiscoveryProxy.cs
-
-REM %WSDL% %SERVER_URL%/BlackBerry.asmx /out:.\WebsitePanel.Server.Client\BlackBerryProxy.cs /namespace:WebsitePanel.Providers.HostedSolution /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\BlackBerryProxy.cs
-
-REM %WSDL% %SERVER_URL%/CRM.asmx /out:.\WebsitePanel.Server.Client\CRMProxy.cs /namespace:WebsitePanel.Providers.CRM /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\CRMProxy.cs
-
-REM %WSDL% %SERVER_URL%/DatabaseServer.asmx /out:.\WebsitePanel.Server.Client\DatabaseServerProxy.cs /namespace:WebsitePanel.Providers.Database /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\DatabaseServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/DNSServer.asmx /out:.\WebsitePanel.Server.Client\DnsServerProxy.cs /namespace:WebsitePanel.Providers.DNS /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\DnsServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/ExchangeServer.asmx /out:.\WebsitePanel.Server.Client\ExchangeServerProxy.cs /namespace:WebsitePanel.Providers.Exchange /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\ExchangeServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/ExchangeServerHostedEdition.asmx /out:.\WebsitePanel.Server.Client\ExchangeServerHostedEditionProxy.cs /namespace:WebsitePanel.Providers.ExchangeHostedEdition /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\ExchangeServerHostedEditionProxy.cs
-
-REM %WSDL% %SERVER_URL%/HostedSharePointServer.asmx /out:.\WebsitePanel.Server.Client\HostedSharePointServerProxy.cs /namespace:WebsitePanel.Providers.HostedSolution /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\HostedSharePointServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/OCSEdgeServer.asmx /out:.\WebsitePanel.Server.Client\OCSEdgeServerProxy.cs /namespace:WebsitePanel.Providers.OCS /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\OCSEdgeServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/OCSServer.asmx /out:.\WebsitePanel.Server.Client\OCSServerProxy.cs /namespace:WebsitePanel.Providers.OCS /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\OCSServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/OperatingSystem.asmx /out:.\WebsitePanel.Server.Client\OperatingSystemProxy.cs /namespace:WebsitePanel.Providers.OS /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\OperatingSystemProxy.cs
-
-REM %WSDL% %SERVER_URL%/Organizations.asmx /out:.\WebsitePanel.Server.Client\OrganizationProxy.cs /namespace:WebsitePanel.Providers.HostedSolution /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\OrganizationProxy.cs
-
-REM %WSDL% %SERVER_URL%/ServiceProvider.asmx /out:.\WebsitePanel.Server.Client\ServiceProviderProxy.cs /namespace:WebsitePanel.Providers /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\ServiceProviderProxy.cs
-
-REM %WSDL% %SERVER_URL%/SharePointServer.asmx /out:.\WebsitePanel.Server.Client\SharePointServerProxy.cs /namespace:WebsitePanel.Providers.SharePoint /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\SharePointServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/VirtualizationServer.asmx /out:.\WebsitePanel.Server.Client\VirtualizationServerProxy.cs /namespace:WebsitePanel.Providers.Virtualization /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\VirtualizationServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/VirtualizationServerForPrivateCloud.asmx /out:.\WebsitePanel.Server.Client\VirtualizationServerForPrivateCloudProxy.cs /namespace:WebsitePanel.Providers.VirtualizationForPC /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\VirtualizationServerForPrivateCloudProxy.cs
-
-REM %WSDL% %SERVER_URL%/WebServer.asmx /out:.\WebsitePanel.Server.Client\WebServerProxy.cs /namespace:WebsitePanel.Providers.Web /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\WebServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/WindowsServer.asmx /out:.\WebsitePanel.Server.Client\WindowsServerProxy.cs /namespace:WebsitePanel.Server /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\WindowsServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/LyncServer.asmx /out:.\WebsitePanel.Server.Client\LyncServerProxy.cs /namespace:WebsitePanel.Providers.Lync /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\LyncServerProxy.cs
-
-REM %WSDL% %SERVER_URL%/HeliconZoo.asmx /out:.\WebsitePanel.Server.Client\HeliconZooProxy.cs /namespace:WebsitePanel.Providers.HeliconZoo /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\HeliconZooProxy.cs
-
-REM %WSDL% %SERVER_URL%/RemoteDesktopServices.asmx /out:.\WebsitePanel.Server.Client\RemoteDesktopServicesProxy.cs /namespace:WebsitePanel.Providers.RemoteDesktopServices /type:webClient /fields
-REM %WSE_CLEAN% .\WebsitePanel.Server.Client\RemoteDesktopServicesProxy.cs
-
-%WSDL% %SERVER_URL%/EnterpriseStorage.asmx /out:.\WebsitePanel.Server.Client\EnterpriseStorageProxy.cs /namespace:WebsitePanel.Providers.EnterpriseStorage /type:webClient /fields
-%WSE_CLEAN% .\WebsitePanel.Server.Client\EnterpriseStorageProxy.cs