diff --git a/Sming/Components/Storage/README.rst b/Sming/Components/Storage/README.rst
index 9a08f5e44b..4d3d7eb6ed 100644
--- a/Sming/Components/Storage/README.rst
+++ b/Sming/Components/Storage/README.rst
@@ -133,12 +133,18 @@ To customise the hardware configuration for a project, for example 'my_project':
             "rom0": {
                "address": "0x10000",
                "size": "0x80000"
+            },
+            "factory": {
+               "size": 0
             }
          }
       }
 
    This will adjust flash parameters (previously via SPI_SPEED, SPI_MODE and SPI_SIZE),
    and the location/size of the primary application partition.
+   The **factory** partition is also dropped by setting its size to 0.
+   This is ignored if no such partition is defined.
+
 
 3. Add any additional partitions:
 
diff --git a/Sming/Components/Storage/Tools/hwconfig/partition.py b/Sming/Components/Storage/Tools/hwconfig/partition.py
index f7b5e312a0..a43edd640a 100644
--- a/Sming/Components/Storage/Tools/hwconfig/partition.py
+++ b/Sming/Components/Storage/Tools/hwconfig/partition.py
@@ -143,6 +143,11 @@ def parse_dict(self, data, devices):
                 raise InputError("Duplicate partition '%s'" % name)
             partnames += name
             part = self.find_by_name(name)
+            # Setting size=0 drops partition if it exists
+            if entry.get('size') == 0:
+                if part:
+                    self.remove(part)
+                continue
             if part is None:
                 part = Entry(devices[0], name)
                 self.append(part)
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk
index b396b06b89..c6bf59b987 100644
--- a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk
+++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk
@@ -49,7 +49,7 @@ COMPONENT_DEPENDS := OtaUpgradeMqtt
 RBOOT_ENABLED := 1
 
 ## Use standard hardware config with two ROM slots and two SPIFFS partitions
-HWCONFIG := ota
+HWCONFIG := spiffs-two-roms
 
 APP_CFLAGS = -DMQTT_URL="\"$(MQTT_URL)"\"                \
 			 -DMQTT_FINGERPRINT_SHA1=$(MQTT_FINGERPRINT_SHA1)   \
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/ota.hw b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/ota.hw
deleted file mode 100644
index c5d71daa72..0000000000
--- a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/ota.hw
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"base_config": "spiffs-two-roms",
-	"partitions": {
-		"rom0": {
-			"subtype": "ota_0"
-		},
-		"rom1": {
-			"subtype": "ota_1"
-		}
-	}
-}
\ No newline at end of file
diff --git a/samples/Basic_Ota/ota.hw b/samples/Basic_Ota/ota.hw
index ed59f038c9..c9f0e9307e 100644
--- a/samples/Basic_Ota/ota.hw
+++ b/samples/Basic_Ota/ota.hw
@@ -2,12 +2,6 @@
 	"name": "Basic OTA sample",
 	"base_config": "spiffs-two-roms",
 	"partitions": {
-		"rom0": {
-			"subtype": "ota_0"
-		},
-		"rom1": {
-			"subtype": "ota_1"
-		},
 		"spiffs0": {
 			"size": "512K"
 		},