diff --git a/Casks/adobe-creative-cloud.rb b/Casks/adobe-creative-cloud.rb
index 3752edaf30..cd0b9cc3d6 100644
--- a/Casks/adobe-creative-cloud.rb
+++ b/Casks/adobe-creative-cloud.rb
@@ -65,27 +65,8 @@ cask "adobe-creative-cloud" do
               "/Applications/Utilities/Adobe Installers/.Uninstall*",
               "/Applications/Utilities/Adobe Installers/Uninstall Adobe Creative Cloud",
               "/Applications/Utilities/Adobe Sync",
-              "/Library/*/com.adobe.acc*",
-              "/Library/Application Support/Adobe/*[Ii]nstall*",
-              "/Library/Application Support/Adobe/ADCRefs",
-              "/Library/Application Support/Adobe/Adobe Desktop Common",
-              "/Library/Application Support/Adobe/Adobe PCD",
-              "/Library/Application Support/Adobe/AdobeApplicationManager",
-              "/Library/Application Support/Adobe/AdobeGC*",
-              "/Library/Application Support/Adobe/CEP/extensions/CC_*",
-              "/Library/Application Support/Adobe/CEP/extensions/com.adobe.ccx.*",
-              "/Library/Application Support/Adobe/Creative Cloud Libraries",
-              "/Library/Application Support/Adobe/Extension Manager CC",
-              "/Library/Application Support/Adobe/OOBE",
-              "/Library/Application Support/Adobe/PCF",
-              "/Library/Application Support/Adobe/SL*",
-              "/Library/Application Support/Adobe/Vulcan",
-              "/Library/Application Support/Adobe/caps",
-              "/Library/Application Support/regid.*.com.adobe",
               "/Library/Internet Plug-Ins/AdobeAAMDetect.plugin",
               "/Library/LaunchDaemons/com.adobe.agsservice.plist",
-              "/Library/Logs/CreativeCloud",
-              "/Library/Preferences/com.adobe.headlights*.plist",
             ],
             rmdir:        [
               "#{appdir}/Adobe Creative Cloud",
@@ -99,6 +80,25 @@ cask "adobe-creative-cloud" do
   zap trash: [
         "/Users/Shared/Adobe/Installer",
         "/Users/Shared/Adobe/OOBE",
+        "/Library/*/com.adobe.acc*",
+        "/Library/Application Support/Adobe/*[Ii]nstall*",
+        "/Library/Application Support/Adobe/ADCRefs",
+        "/Library/Application Support/Adobe/Adobe Desktop Common",
+        "/Library/Application Support/Adobe/Adobe PCD",
+        "/Library/Application Support/Adobe/AdobeApplicationManager",
+        "/Library/Application Support/Adobe/AdobeGC*",
+        "/Library/Application Support/Adobe/CEP/extensions/CC_*",
+        "/Library/Application Support/Adobe/CEP/extensions/com.adobe.ccx.*",
+        "/Library/Application Support/Adobe/Creative Cloud Libraries",
+        "/Library/Application Support/Adobe/Extension Manager CC",
+        "/Library/Application Support/Adobe/OOBE",
+        "/Library/Application Support/Adobe/PCF",
+        "/Library/Application Support/Adobe/SL*",
+        "/Library/Application Support/Adobe/Vulcan",
+        "/Library/Application Support/Adobe/caps",
+        "/Library/Application Support/regid.*.com.adobe",
+        "/Library/Logs/CreativeCloud",
+        "/Library/Preferences/com.adobe.headlights*.plist",
         "~/Creative Cloud Files",
         "~/Creative Cloud Files/Icon?",
         "~/Library/*/Adobe/CoreSync",
@@ -121,6 +121,7 @@ cask "adobe-creative-cloud" do
         "~/Library/Logs/PDApp*.log",
         "~/Library/Preferences/Adobe/.[A-Z0-9]???????????",
         "~/Library/Preferences/com.adobe.crashreporter.plist",
+
       ],
       rmdir: [
         "/Users/Shared/Adobe",