diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90c538731f..5ad3aa19cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,6 @@ endif()
 # Include mbed.h and config from generate folder
 target_include_directories(mbed-os PUBLIC .)
 
-# Link config from generate folder
-# TODO: @mbed-os-tools We need to get this gen_config somehow set up
-target_link_libraries(mbed-os PRIVATE gen_config)
-
 # Default build
 add_subdirectory(cmsis)
 add_subdirectory(components)
diff --git a/cmake/app.cmake b/cmake/app.cmake
index 528a14457f..78579fcab6 100644
--- a/cmake/app.cmake
+++ b/cmake/app.cmake
@@ -25,7 +25,7 @@ endif()
 add_subdirectory(mbed-os)
 
 # Link the example libs
-target_link_libraries(app mbed-os gen_config)
+target_link_libraries(app mbed-os)
 
 # I have  to  leave this here as linker is processed after mbed-os added, and can't be in toolchain.cmake
 # as its global symbol is empty at that stage, this needs more work