diff --git a/overlays/firmware-extended/22-vpn/root/usr/local/share/firmware-config/functions/15_settings_vpn.yaml b/overlays/firmware-extended/22-vpn/root/usr/local/share/firmware-config/functions/15_settings_vpn.yaml
index 1993c5ee..64832604 100644
--- a/overlays/firmware-extended/22-vpn/root/usr/local/share/firmware-config/functions/15_settings_vpn.yaml
+++ b/overlays/firmware-extended/22-vpn/root/usr/local/share/firmware-config/functions/15_settings_vpn.yaml
@@ -33,6 +33,7 @@ settings:
                 /usr/local/bin/extended-config.py add /home/lava/printer_data/config/extended/extended2.cfg remote_access vpn none
                 /etc/init.d/S99vpn stop
                 /usr/local/bin/tailscale-pkg clean
+                rm -rf /home/lava/printer_data/tailscale
           tailscale:
             label: Tailscale
             cmd:
diff --git a/overlays/firmware-extended/23-cloud/root/usr/local/share/firmware-config/functions/24_settings_cloud.yaml b/overlays/firmware-extended/23-cloud/root/usr/local/share/firmware-config/functions/24_settings_cloud.yaml
index e5423aba..def3b081 100644
--- a/overlays/firmware-extended/23-cloud/root/usr/local/share/firmware-config/functions/24_settings_cloud.yaml
+++ b/overlays/firmware-extended/23-cloud/root/usr/local/share/firmware-config/functions/24_settings_cloud.yaml
@@ -21,6 +21,7 @@ settings:
                 /usr/local/bin/extended-config.py add /home/lava/printer_data/config/extended/extended2.cfg remote_access cloud none &&
                 /etc/init.d/S99cloud stop
                 /usr/local/bin/octoeverywhere-pkg clean
+                rm -rf /home/lava/printer_data/octoeverywhere-store
           octoeverywhere:
             label: OctoEverywhere
             cmd:
@@ -48,7 +49,7 @@ settings:
 
                 for i in {1..15}; do
                     echo ">> Looking for authorization URL in logs... ($i)"
-                    if MATCH=$(grep -C 20 "This Plugin Isn't Connected To OctoEverywhere!" /home/lava/printer_data/logs/octoeverywhere.log); then
+                    if MATCH=$(grep -C 20 "This Plugin Isn't Connected To OctoEverywhere!" /home/lava/printer_data/logs/octoeverywhere.log 2>/dev/null); then
                         sed -n 's/.*WARNING //p' <<< "$MATCH"
                         exit 0
                     fi