diff --git a/modules.d/TSK_ApplicationExperiences.conf b/modules.d/TSK_ApplicationExperiences.conf
deleted file mode 100644
index e448f52..0000000
--- a/modules.d/TSK_ApplicationExperiences.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name" : "Remove Applcation Experiences Tasks",
-    "description" : "Is mostly consist of user data analyse for user experience",
-    "actions" :
-    [
-        {
-            "_comment" : "",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Application Experience\\",
-            "name" : "AitAgent" 
-        },
-        {
-            "_comment" : "Disable telemetry collect for Microsoft user experience - Compatibility",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Application Experience\\",
-            "name" : "Microsoft Compatibility Appraiser" 
-        },
-        {
-            "_comment" : "Disable telemetry collect for Microsoft user experience - Program Data",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Application Experience\\",
-            "name" : "ProgramDataUpdater" 
-        },
-        {
-            "_comment" : "Disable startup tasks analyser and user notification",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Application Experience\\",
-            "name" : "AitAgent" 
-        }
-    ]
-}
diff --git a/modules.d/TSK_CustomerExperience.conf b/modules.d/TSK_CustomerExperience.conf
deleted file mode 100644
index 10e9a6c..0000000
--- a/modules.d/TSK_CustomerExperience.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name" : "Remove Customer xperiences Tasks",
-    "description" : "Is mostly consist of user data analyse for user experience",
-    "actions" :
-    [
-        {
-            "_comment" : "",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Customer Experience Improvement Program\\",
-            "name" : "BthSQM" 
-        },
-        {
-            "_comment" : "Disable user data consolidation and sent to Microsoft (if user subscribe to MS User Experience program)",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Customer Experience Improvement Program\\",
-            "name" : "Consolidator"
-        },
-        {
-            "_comment" : "",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Customer Experience Improvement Program\\",
-            "name" : "KernelCeipTask" 
-        },
-        {
-            "_comment" : "Disable USB data collect and sent to Microsoft (if user subscribe to MS User Experience program)",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Customer Experience Improvement Program\\",
-            "name" : "UsbCeip" 
-        }
-    ]
-}
diff --git a/modules.d/TSK_Feedback.conf b/modules.d/TSK_Feedback.conf
deleted file mode 100644
index bc7a953..0000000
--- a/modules.d/TSK_Feedback.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name" : "User feedback tasks",
-    "description" : "Disable User Feedback tasks",
-    "actions" :
-    [
-        {
-            "_comment" : "",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Feedback\\Siuf\\",
-            "name" : "DmClient" 
-        },
-        {
-            "_comment" : "",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Feedback\\Siuf\\",
-            "name" : "DmClientOnScenarioDownload" 
-        }
-    ]
-}
diff --git a/modules.d/TSK_LocationMaps.conf b/modules.d/TSK_LocationMaps.conf
deleted file mode 100644
index a9cb1c6..0000000
--- a/modules.d/TSK_LocationMaps.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name" : "Location and Maps Tasks",
-    "description" : "Remove Location ans Maps relative tasks",
-    "actions" :
-    [
-        {
-            "_comment" : "Disable location notification task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Location\\",
-            "name" : "Notifications" 
-        },
-        {
-            "_comment" : "",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Location\\",
-            "name" : "WindowsActionDialog" 
-        },
-        {
-            "_comment" : "Disable maps toasts task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Maps\\",
-            "name" : "\\MapsToastTask" 
-        },
-        {
-            "_comment" : "Disable maps update task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Maps\\",
-            "name" : "MapsUpdateTask" 
-        }
-    ]
-}
diff --git a/modules.d/TSK_Shell.conf b/modules.d/TSK_Shell.conf
deleted file mode 100644
index 59e302d..0000000
--- a/modules.d/TSK_Shell.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "name" : "Remove Windows shell Tasks",
-    "description" : "Disable tasks relative to parental lock",
-    "actions" :
-    [
-        {
-            "_comment" : "Disable sync setting with Microsoft familly service task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Shell\\",
-            "name" : "FamilySafetyMonitorToastTask" 
-        },
-        {
-            "_comment" : "Disable parental lock monitor task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\shell\\",
-            "name" : "FamilySafetyMonitor" 
-        },
-        {
-            "_comment" : "Disable parental lock update task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Shell\\",
-            "name" : "FamilySafetyRefreshTask" 
-        }
-    ]
-}
diff --git a/modules.d/TSK_Various.conf b/modules.d/TSK_Various.conf
deleted file mode 100644
index c353865..0000000
--- a/modules.d/TSK_Various.conf
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "name" : "Varisous Tasks",
-    "description" : "Unsorted Task to disable",
-    "actions" :
-    [
-        {
-            "_comment" : "Disable proxy for telemetry data",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Autochk\\",
-            "name" : "Proxy" 
-        },
-        {
-            "_comment" : "Disable Windows Store licence check task, task exist but Get-ScheduledTask doesn't found it!",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Clip\\",
-            "name" : "License Validation" 
-        },
-        {
-            "_comment" : "",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\CloudExperienceHost\\",
-            "name" : "CloudExperienceHost" 
-        },
-        {
-            "_comment" : "",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Device Information\\",
-            "name" : "device" 
-        },
-        {
-            "_comment" : "Disable disk diagnostic data collect and sent task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\DiskDiagnostic\\",
-            "name" : "Microsoft-Windows-DiskDiagnosticDataCollector" 
-        },
-        {
-            "_comment" : "Disable exchanges temporary preinstalled licenses for Windows Store licenses task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\License Manager\\",
-            "name" : "TempSignedLicenseExchange" 
-        },
-        {
-            "_comment" : "Disable system performance probe task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Maintenance\\",
-            "name" : "WinSAT" 
-        },
-        {
-            "_comment" : "Disable network information data collect",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\NetTrace\\",
-            "name" : "GatherNetworkInfo" 
-        },
-        {
-            "_comment" : "disable secure boot and boot time data collect and analysis task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\PI\\",
-            "name" : "Sqm-Tasks"
-        },
-        {
-            "_comment" : "Disable system analysis for power managment efficiency",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Power Efficiency Diagnostics\\",
-            "name" : "AnalyzeSystem" 
-        },
-        {
-            "_comment" : "On my test system this task do not exist",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\RetailDemo\\",
-            "name" : "CleanupOfflineContent" 
-        },
-        {
-            "_comment" : "Disable backgroud upload settings to Microsoft servers task (for sync I suppose)",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\SettingSync\\",
-            "name" : "BackgroundUploadTask"
-        },
-        {
-            "_comment" : "Disable speech model download task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Speech\\",
-            "name" : "SpeechModelDownloadTask" 
-        },
-        {
-            "_comment" : "Disable queued data report analysis and sent task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\Windows Error Reporting\\",
-            "name" : "Windows Error Reporting" 
-        },
-        {
-            "_comment" : "Disable automatic application update from Microsoft Store task",
-            "action" : "RemoveScheduledTask",
-            "path" : "\\Microsoft\\Windows\\WindowsUpdate\\",
-            "name" : "Automatic App Update" 
-        }
-    ]
-}