diff --git a/deployment/windows/wixSetup/appDataDir.wxs b/deployment/windows/wixSetup/appDataDir.wxs
index 1608967e..d384ddad 100644
--- a/deployment/windows/wixSetup/appDataDir.wxs
+++ b/deployment/windows/wixSetup/appDataDir.wxs
@@ -1,14 +1,7 @@
 <?xml version='1.0'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 	<Fragment>
-		<DirectoryRef Id='CoatiAppData'>
-			<Component Id="ApplicationSettingsXml" Guid="C8883C69-3123-4382-BDB1-771C206EE461">
-							<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\coatiApplicationSettings" Root="HKCU" >
-								<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-							</RegistryKey>
-							<File Id='ApplicationSettings' Name='ApplicationSettings.xml' DiskId='1' Source='./../../../bin/app/user/ApplicationSettings_for_package.xml' KeyPath='no' />
-						</Component>
-						
+		<DirectoryRef Id='CoatiAppData'>			
 						<Directory Id="SampleProjects" Name="projects">
 						
 							<Component Id="SampleProjects" Guid="12F6C3BE-CE83-441A-8A5D-E49EA1483F24">
diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs
index 28d0e2ca..551ca3b8 100644
--- a/deployment/windows/wixSetup/coati.wxs
+++ b/deployment/windows/wixSetup/coati.wxs
@@ -283,7 +283,6 @@
 				<ComponentRef Id='CoatiSoftwareAppDataDummy'/>
 
 				<ComponentRef Id='WindowSettingsIni'/>
-				<ComponentRef Id='ApplicationSettingsXml'/>
 			<!-- </Feature> -->
 
 			<!-- Sample Projects for AddData Folder -->
@@ -328,7 +327,6 @@
 		<InstallExecuteSequence>
 			<Custom Action='AlreadyUpdated' After='FindRelatedProducts'>SELFFOUND</Custom>
 			<Custom Action='NoDowngrade' After='FindRelatedProducts'>NEWERFOUND</Custom>
-			<Custom Action='SetupAppSettings' After='InstallFiles'>NOT Installed AND NOT PATCH</Custom>
 			<Custom Action='UninstallRemoveLogFolder' After='UnpublishComponents'>(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
 		</InstallExecuteSequence>
 
diff --git a/deployment/windows/wixSetup/customActions.wxs b/deployment/windows/wixSetup/customActions.wxs
index 9623af4d..cc5479c3 100644
--- a/deployment/windows/wixSetup/customActions.wxs
+++ b/deployment/windows/wixSetup/customActions.wxs
@@ -1,10 +1,6 @@
 <?xml version='1.0'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 	<Fragment>
-		<CustomAction Id='SetupAppSettings' BinaryKey='SetupAppSettingsBinary' DllEntry='Main' Execute='commit' Return='check'/>
-		<Binary Id='SetupAppSettingsBinary' SourceFile='build/SetupAppSettings.CA.dll'/>
-	
-	
 		<CustomAction Id='UninstallRemoveLogFolder' BinaryKey='UninstallRemoveLogFolderBinary' DllEntry='Main' Execute='commit' Return='check'/>
 		<Binary Id='UninstallRemoveLogFolderBinary' SourceFile='build/UninstallRemoveLogFolder.CA.dll'/>
 	</Fragment>