diff --git a/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt b/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt
index 29c262380..e2851dd89 100644
--- a/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt
@@ -52,6 +52,7 @@ set(STM32_STDPERIPH_SRC
   ${STM32_STDPERIPH_DIR}/src/stm32f4xx_pwr.c
   ${STM32_STDPERIPH_DIR}/src/stm32f4xx_usart.c
   ${STM32_STDPERIPH_DIR}/src/stm32f4xx_adc.c
+  ${STM32_STDPERIPH_DIR}/src/stm32f4xx_flash.c
 )
 
 if(CPU_TYPE_FULL STREQUAL STM32F429xI)
@@ -63,7 +64,7 @@ if(CPU_TYPE_FULL STREQUAL STM32F429xI)
     ${STM32_STDPERIPH_DIR}/src/stm32f4xx_dma2d.c
     ${STM32_STDPERIPH_DIR}/src/stm32f4xx_sdio.c
     )
-elseif()
+else()
   set(STM32_STDPERIPH_SRC ${STM32_STDPERIPH_SRC}
     targets/${TARGET_DIR}/startup_stm32f40_41xxx.s
     )  
diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt
index 70682e7d0..808e754d9 100644
--- a/radio/src/targets/horus/CMakeLists.txt
+++ b/radio/src/targets/horus/CMakeLists.txt
@@ -100,10 +100,6 @@ if (PCB STREQUAL X10)
       set(AUX2_SERIAL ON)
     endif()
     set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")    
-    set(FIRMWARE_TARGET_SRC
-    ${FIRMWARE_TARGET_SRC}
-       ../../thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
-      )
   elseif (PCBREV STREQUAL TX16S)
     set(FLAVOUR tx16s)
     set(LUA_EXPORT lua_export_t16)
@@ -121,10 +117,6 @@ if (PCB STREQUAL X10)
       set(AUX2_SERIAL ON)
     endif()
     set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
-    set(FIRMWARE_TARGET_SRC
-    ${FIRMWARE_TARGET_SRC}
-       ../../thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
-      )
   elseif (PCBREV STREQUAL T18)
     set(FLAVOUR t18)
     set(LUA_EXPORT lua_export_t16)
@@ -139,10 +131,6 @@ if (PCB STREQUAL X10)
       set(AUX2_SERIAL ON)
     endif()
     set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")    
-    set(FIRMWARE_TARGET_SRC
-    ${FIRMWARE_TARGET_SRC}
-       ../../thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
-      )
   else()
     set(FLAVOUR x10)
     set(DEFAULT_INTERNAL_MODULE XJT_PXX1 CACHE STRING "Default internal module")
diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt
index 3b16bffe3..afedf0bfa 100644
--- a/radio/src/targets/taranis/CMakeLists.txt
+++ b/radio/src/targets/taranis/CMakeLists.txt
@@ -30,7 +30,6 @@ if(PCB STREQUAL X9E)
   set(FIRMWARE_TARGET_SRC
     ${FIRMWARE_TARGET_SRC}
     top_lcd_driver.cpp
-    startup_stm32f40_41xxx.s
     )
   set(AUX_SERIAL ON)
   if(STICKS STREQUAL HORUS)
@@ -71,10 +70,6 @@ elseif(PCB STREQUAL X9D+)
     set(CPU_TYPE_FULL STM32F407xE)  # for size report
     set(LINKER_SCRIPT targets/taranis/stm32f4_flash.ld)
     set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
-    set(FIRMWARE_TARGET_SRC
-      ${FIRMWARE_TARGET_SRC}
-      startup_stm32f40_41xxx.s
-      )
     add_definitions(-DRADIO_X9DP2019)
     add_definitions(-DSTM32F40_41xxx -DSTM32F407xx)
     add_definitions(-DSOFTWARE_VOLUME -DPWR_BUTTON_${PWR_BUTTON} -DHARDWARE_POWER_MANAGEMENT_UNIT)
@@ -215,11 +210,6 @@ elseif(PCB STREQUAL X7)
     set(CPU_TYPE_FULL STM32F407xE)  # for size report
     add_definitions(-DSTM32F407xx)
     set(LINKER_SCRIPT targets/taranis/stm32f4_flash.ld)
-    set(FIRMWARE_TARGET_SRC
-            ${FIRMWARE_TARGET_SRC}
-            startup_stm32f40_41xxx.s
-            ../../thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
-            )
     add_definitions(-DSTM32F40_41xxx -DSTM32F407xx)
     set(ROTARY_ENCODER YES)
     set(LUA_EXPORT lua_export_tx12mk2)
@@ -241,11 +231,6 @@ elseif(PCB STREQUAL X7)
     set(CPU_TYPE_FULL STM32F407xE)  # for size report
     add_definitions(-DSTM32F407xx)
     set(LINKER_SCRIPT targets/taranis/stm32f4_flash.ld)
-    set(FIRMWARE_TARGET_SRC
-      ${FIRMWARE_TARGET_SRC}
-      startup_stm32f40_41xxx.s
-      ../../thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
-      )
     add_definitions(-DSTM32F40_41xxx -DSTM32F407xx)
     set(ROTARY_ENCODER YES)
     set(LUA_EXPORT lua_export_zorro)
@@ -287,11 +272,6 @@ elseif(PCB STREQUAL X7)
     set(CPU_TYPE_FULL STM32F407xE)  # for size report
     add_definitions(-DSTM32F407xx)
     set(LINKER_SCRIPT targets/taranis/stm32f4_flash.ld)
-    set(FIRMWARE_TARGET_SRC
-      ${FIRMWARE_TARGET_SRC}
-      startup_stm32f40_41xxx.s
-      ../../thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
-      )
     add_definitions(-DSTM32F407xx -DSTM32F40_41xxx)  
     set(ROTARY_ENCODER NO)
     set(LUA_EXPORT lua_export_commando8)
@@ -314,10 +294,6 @@ elseif(PCB STREQUAL X7)
     add_definitions(-DEEPROM_VARIANT=0x4000)
     add_definitions(-DPCBREV=${PCBREV})
     add_definitions(-DPCBX7ACCESS)
-    set(FIRMWARE_TARGET_SRC
-      ${FIRMWARE_TARGET_SRC}
-      startup_stm32f40_41xxx.s
-      )
     add_definitions(-DSTM32F40_41xxx -DSTM32F407xx)
     add_definitions(-DHARDWARE_POWER_MANAGEMENT_UNIT)
     set(PXX2 ON)