diff --git a/src/carriers/CMakeLists.txt b/src/carriers/CMakeLists.txt
index 27871e1d06..14315291a1 100644
--- a/src/carriers/CMakeLists.txt
+++ b/src/carriers/CMakeLists.txt
@@ -41,7 +41,4 @@ yarp_install_basic_package_files(YARP_yarpcar
   PRIVATE_DEPENDENCIES ${YARP_yarpcar_PRIVATE_DEPS}
 )
 
-set_property(TARGET yarpcar PROPERTY FOLDER "Plugins/Carrier")
-
-include(YarpDeprecatedOption)
-yarp_renamed_option(CREATE_OPTIONAL_CARRIERS YARP_COMPILE_CARRIER_PLUGINS) # since YARP 3.0.0
+set_property(TARGET yarpcar PROPERTY FOLDER "Plugins")
diff --git a/src/devices/CMakeLists.txt b/src/devices/CMakeLists.txt
index 98a5520603..827c8f65f5 100644
--- a/src/devices/CMakeLists.txt
+++ b/src/devices/CMakeLists.txt
@@ -171,6 +171,4 @@ yarp_install_basic_package_files(YARP_yarpmod
   PRIVATE_DEPENDENCIES ${YARP_yarpmod_PRIVATE_DEPS}
 )
 
-set_property(TARGET yarpmod PROPERTY FOLDER "Plugins/Device")
-
-yarp_renamed_option(CREATE_DEVICE_LIBRARY_MODULES YARP_COMPILE_DEVICE_PLUGINS) # since YARP 3.0.0
+set_property(TARGET yarpmod PROPERTY FOLDER "Plugins")
diff --git a/src/portmonitors/CMakeLists.txt b/src/portmonitors/CMakeLists.txt
index 7ef5008e8f..3f3aa84b77 100644
--- a/src/portmonitors/CMakeLists.txt
+++ b/src/portmonitors/CMakeLists.txt
@@ -41,6 +41,4 @@ yarp_install_basic_package_files(YARP_yarppm
   PRIVATE_DEPENDENCIES ${YARP_yarppm_PRIVATE_DEPS}
 )
 
-set_property(TARGET yarppm PROPERTY FOLDER "Plugins/PortMonitors")
-
-include(YarpDeprecatedOption)
+set_property(TARGET yarppm PROPERTY FOLDER "Plugins")