diff --git a/Casks/clean-me.rb b/Casks/clean-me.rb
index 9ea83611e6..6e99f738e8 100644
--- a/Casks/clean-me.rb
+++ b/Casks/clean-me.rb
@@ -17,6 +17,8 @@ cask "clean-me" do
 
   app "Clean Me.app"
 
+  # No zap stanza required
+
   caveats do
     discontinued
   end
diff --git a/Casks/deluge.rb b/Casks/deluge.rb
index d426a5cb2f..533ebaece6 100644
--- a/Casks/deluge.rb
+++ b/Casks/deluge.rb
@@ -14,4 +14,10 @@ cask "deluge" do
   end
 
   app "Deluge.app"
+
+  zap trash: [
+    "~/.config/deluge/",
+    "~/Library/Preferences/org.deluge.plist",
+    "~/Library/Saved Application State/org.deluge.savedState",
+  ]
 end
diff --git a/Casks/finicky.rb b/Casks/finicky.rb
index ccd00d920d..f4aed0ca7d 100644
--- a/Casks/finicky.rb
+++ b/Casks/finicky.rb
@@ -15,4 +15,6 @@ cask "finicky" do
   depends_on macos: ">= :sierra"
 
   app "Finicky.app"
+
+  zap trash: "~/Library/Preferences/net.kassett.finicky.plist"
 end
diff --git a/Casks/gdisk.rb b/Casks/gdisk.rb
index 5b2bfbe0ea..f15553eede 100644
--- a/Casks/gdisk.rb
+++ b/Casks/gdisk.rb
@@ -10,4 +10,6 @@ cask "gdisk" do
   pkg "gdisk-#{version}.pkg"
 
   uninstall pkgutil: "com.rodsbooks.pkg.gdisk"
+
+  # No zap stanza required
 end
diff --git a/Casks/keystore-explorer.rb b/Casks/keystore-explorer.rb
index 7583430f43..975864f0c1 100644
--- a/Casks/keystore-explorer.rb
+++ b/Casks/keystore-explorer.rb
@@ -9,4 +9,6 @@ cask "keystore-explorer" do
   homepage "https://keystore-explorer.org/"
 
   app "KeyStore Explorer.app"
+
+  zap trash: "~/Library/Saved Application State/org.kse.keystore-explorer.savedState"
 end
diff --git a/Casks/michaelvillar-timer.rb b/Casks/michaelvillar-timer.rb
index e93005f87f..d54d0b0210 100644
--- a/Casks/michaelvillar-timer.rb
+++ b/Casks/michaelvillar-timer.rb
@@ -8,4 +8,11 @@ cask "michaelvillar-timer" do
   homepage "https://github.com/michaelvillar/timer-app"
 
   app "Timer.app"
+
+  uninstall quit: "com.michaelvillar.Timer"
+
+  zap trash: [
+    "~/Library/Preferences/com.michaelvillar.Timer.plist",
+    "~/Library/Saved Application State/com.michaelvillar.Timer.savedState",
+  ]
 end
diff --git a/Casks/parallels-virtualization-sdk.rb b/Casks/parallels-virtualization-sdk.rb
index fd7fa500f8..7914c4cabe 100644
--- a/Casks/parallels-virtualization-sdk.rb
+++ b/Casks/parallels-virtualization-sdk.rb
@@ -14,4 +14,6 @@ cask "parallels-virtualization-sdk" do
   pkg "Parallels Virtualization SDK.pkg"
 
   uninstall pkgutil: "com.parallels.pkg.sdk"
+
+  # No zap stanza required
 end
diff --git a/Casks/picgo.rb b/Casks/picgo.rb
index 44e3fb876a..0c7823c053 100644
--- a/Casks/picgo.rb
+++ b/Casks/picgo.rb
@@ -16,4 +16,10 @@ cask "picgo" do
   end
 
   app "PicGo.app"
+
+  zap trash: [
+    "~/Library/Application Support/picgo",
+    "~/Library/Preferences/com.molunerfinn.picgo.plist",
+    "~/Library/Services/Upload pictures with PicGo.workflow",
+  ]
 end
diff --git a/Casks/smlnj.rb b/Casks/smlnj.rb
index d5412fb16a..6ffeca0a5c 100644
--- a/Casks/smlnj.rb
+++ b/Casks/smlnj.rb
@@ -17,6 +17,8 @@ cask "smlnj" do
 
   uninstall pkgutil: "org.smlnj.amd64.pkg"
 
+  zap delete: "/usr/local/smlnj"
+
   caveats do
     path_environment_variable "/usr/local/smlnj/bin"
   end
diff --git a/Casks/youtube-downloader.rb b/Casks/youtube-downloader.rb
index a7d45b351b..58588fcbf5 100644
--- a/Casks/youtube-downloader.rb
+++ b/Casks/youtube-downloader.rb
@@ -8,4 +8,6 @@ cask "youtube-downloader" do
   homepage "https://github.com/DenBeke/YouTube-Downloader-for-macOS"
 
   app "Youtube Downloader.app"
+
+  zap trash: "~/Library/Preferences/denbeke.Youtube-Downloader.plist"
 end