diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51822.c b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51822.c
index 88cbe35ba6..e3f60b3b1b 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51822.c
+++ b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51822.c
@@ -83,6 +83,17 @@ void SystemInit(void)
     while (NRF_CLOCK->EVENTS_LFCLKSTARTED == 0) {
         // Do nothing.
     }
+	
+	// Default SWIO setting, pull SWIO(p19) to low for turning antenna switch to BLE radiated path.
+#ifdef TARGET_DELTA_DFCM_NNN40
+	NRF_GPIO->PIN_CNF[19] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
+                                        | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
+                                        | (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos)
+                                        | (GPIO_PIN_CNF_INPUT_Disconnect << GPIO_PIN_CNF_INPUT_Pos)
+                                        | (GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos);
+
+	NRF_GPIO->OUTCLR 		= 	(GPIO_OUTCLR_PIN19_Clear << GPIO_OUTCLR_PIN19_Pos);
+#endif
 }
 
 static bool is_manual_peripheral_setup_needed(void)
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h
index 7e19c11cb5..1acb4d2a0b 100644
--- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h
+++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h
@@ -50,7 +50,7 @@ typedef enum {
     p16 = 16,
     p17 = 17,
     p18 = NC,
-    p19 = NC,
+    p19 = 19,
     p20 = 20,
     p21 = 21,
     p22 = 22,
@@ -96,7 +96,9 @@ typedef enum {
     A3  = p3,
     A4  = p4,
     A5  = p5,
-
+	
+	SWIO = p19,
+	VERF0 = p0,
     // Not connected
 	
 	CTS_PIN_NUMBER	= NC,
diff --git a/workspace_tools/muts_all.json b/workspace_tools/muts_all.json
deleted file mode 100644
index a40550a43f..0000000000
--- a/workspace_tools/muts_all.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "1" : { 
-            "mcu": "DELTA_DFCM_NNN40",
-			"port":"COM56",
-            "disk":"F:\\",
-            "peripherals": ["24LC256"]
-    }
-}
\ No newline at end of file
diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py
index 3a1345bf40..953f07343d 100644
--- a/workspace_tools/targets.py
+++ b/workspace_tools/targets.py
@@ -849,15 +849,12 @@ class DELTA_DFCM_NNN40(NRF51822):
         self.core = "Cortex-M0"
         self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
         self.macros = ['TARGET_NRF51822']
-        self.supported_toolchains = "GCC_ARM"
 
 class DELTA_DFCM_NNN40_OTA(NRF51822):
     def __init__(self):
         NRF51822.__init__(self)
         self.core = "Cortex-M0"
         self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'DELTA_DFCM_NNN40']
-        self.macros = ['TARGET_NRF51822', 'TARGET_DELTA_DFCM_NNN40','TARGET_OTA_ENABLED']
-        self.supported_toolchains = "GCC_ARM"
         self.MERGE_SOFT_DEVICE = False
 
 
diff --git a/workspace_tools/test_spec.json b/workspace_tools/test_spec.json
deleted file mode 100644
index 647f21f89f..0000000000
--- a/workspace_tools/test_spec.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"targets": {
-        "DELTA_DFCM_NNN40" : ["GCC_ARM"]
-     }
-}
\ No newline at end of file