diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h
deleted file mode 100644
index 926f23b304..0000000000
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ODIN_W2_MBEDTLS_CONFIG_H_
-#define _ODIN_W2_MBEDTLS_CONFIG_H_
-
-#define MBEDTLS_ARC4_C
-#define MBEDTLS_DES_C
-#define MBEDTLS_MD4_C
-#define MBEDTLS_MD5_C
-#define MBEDTLS_SHA1_C
-
-#endif /* _ODIN_W2_MBEDTLS_CONFIG_H_ */
diff --git a/targets/targets.json b/targets/targets.json
index f73dc8c6bf..1a84acd6bb 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1272,7 +1272,7 @@
         "default_toolchain": "ARM",
         "supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
         "extra_labels": ["STM", "STM32F4", "STM32F439", "STM32F439ZI","STM32F439xx"],
-        "macros": ["HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000", "CB_INTERFACE_SDIO","CB_CHIP_WL18XX","SUPPORT_80211D_ALWAYS","WLAN_ENABLED","MBEDTLS_USER_CONFIG_FILE=\"sdk/odin_w2_mbedtls_config.h\""],
+        "macros": ["HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000", "CB_INTERFACE_SDIO","CB_CHIP_WL18XX","SUPPORT_80211D_ALWAYS","WLAN_ENABLED","MBEDTLS_ARC4_C","MBEDTLS_DES_C","MBEDTLS_MD4_C","MBEDTLS_MD5_C","MBEDTLS_SHA1_C"],
         "inherits": ["Target"],
         "device_has": ["ANALOGIN", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "TRNG"],
         "features": ["LWIP"],