diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c39a4c066..317406cd90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,11 +31,3 @@ add_subdirectory(platform)
 add_subdirectory(rtos)
 add_subdirectory(storage)
 add_subdirectory(targets)
-
-
-# Add additional component
-get_property(component GLOBAL PROPERTY MBED_COMPONENT)
-
-foreach(module ${component})
-    add_subdirectory(${module})
-endforeach()
diff --git a/cmake/env.cmake b/cmake/env.cmake
index 5df29b45ce..b1bbcf4303 100644
--- a/cmake/env.cmake
+++ b/cmake/env.cmake
@@ -9,9 +9,3 @@ set(CMAKE_CXX_COMPILER_WORKS TRUE)
 
 # Project setup
 enable_language(C CXX ASM)
-
-# Enabled components within a project
-# TODO: @mbed-os-tools This needs to come from tools
-# If this is a list like rtos/wifi/networking, we need to figure out the path in Mbed OS (have dictionary or
-# something similar). The best would be if this list contains list of module paths (rtos/ features/ble etc)
-set_property(GLOBAL PROPERTY MBED_COMPONENTS "")