diff --git a/feeds/wlan-ap/opensync/files/bin/flash-firmware b/feeds/wlan-ap/opensync/files/bin/flash-firmware
index 4e175cccb..6552fe1dd 100755
--- a/feeds/wlan-ap/opensync/files/bin/flash-firmware
+++ b/feeds/wlan-ap/opensync/files/bin/flash-firmware
@@ -43,8 +43,6 @@ if [ "$?" != "0" ] ; then
   uci set system.tip.inactivefw="${FW_BACKUP}"
   uci commit system
   echo "$0: Sysupgrade failed."
-  rm /tmp/sysupgrade.meta
-  rm /tmp/upgrade.*
   exit 1
 fi
 
diff --git a/feeds/wlan-ap/opensync/patches/39-allow-upgrade-retry.patch b/feeds/wlan-ap/opensync/patches/39-allow-upgrade-retry.patch
deleted file mode 100644
index 14add5414..000000000
--- a/feeds/wlan-ap/opensync/patches/39-allow-upgrade-retry.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/um/src/um_ovsdb.c
-+++ b/src/um/src/um_ovsdb.c
-@@ -356,7 +356,8 @@ static void callback_AWLAN_Node(
-                 //TODO Is there something that needs to be done here?
-             }
- 
--            if(awlan_node->upgrade_timer_changed){
-+            if(awlan_node->upgrade_timer_changed
-+                || ((awlan_node->firmware_url_changed) && (strlen(awlan_node->firmware_url) > 0))) {
-                 if (awlan_node->upgrade_timer > 0)
-                 {
-                     /* if there is active timer, stop it to set new value   */