258 files changed, 191 insertions, 766 deletions

diff --git a/templates/feature/agl-cloudproxy/50_local.conf.inc b/_to_remove/feature/agl-cloudproxy/50_local.conf.inc
index 93b0cb407..93b0cb407 100644
--- a/templates/feature/agl-cloudproxy/50_local.conf.inc
+++ b/_to_remove/feature/agl-cloudproxy/50_local.conf.inc
diff --git a/recipes-apis/agl-service-bluetooth-map/agl-service-bluetooth-map_git.bb b/_to_remove/recipes-apis/agl-service-bluetooth-map/agl-service-bluetooth-map_git.bb
index 4ff82fee1..4ff82fee1 100644
--- a/recipes-apis/agl-service-bluetooth-map/agl-service-bluetooth-map_git.bb
+++ b/_to_remove/recipes-apis/agl-service-bluetooth-map/agl-service-bluetooth-map_git.bb
diff --git a/recipes-apis/agl-service-bluetooth-pbap/agl-service-bluetooth-pbap_git.bb b/_to_remove/recipes-apis/agl-service-bluetooth-pbap/agl-service-bluetooth-pbap_git.bb
index 7b5e7e429..7b5e7e429 100644
--- a/recipes-apis/agl-service-bluetooth-pbap/agl-service-bluetooth-pbap_git.bb
+++ b/_to_remove/recipes-apis/agl-service-bluetooth-pbap/agl-service-bluetooth-pbap_git.bb
diff --git a/recipes-apis/agl-service-bluetooth/agl-service-bluetooth_git.bb b/_to_remove/recipes-apis/agl-service-bluetooth/agl-service-bluetooth_git.bb
index 76f5ffa39..76f5ffa39 100644
--- a/recipes-apis/agl-service-bluetooth/agl-service-bluetooth_git.bb
+++ b/_to_remove/recipes-apis/agl-service-bluetooth/agl-service-bluetooth_git.bb
diff --git a/recipes-apis/agl-service-can-high-level-viwi/agl-service-can-high-level-viwi.bb b/_to_remove/recipes-apis/agl-service-can-high-level-viwi/agl-service-can-high-level-viwi.bb
index 81788646c..81788646c 100644
--- a/recipes-apis/agl-service-can-high-level-viwi/agl-service-can-high-level-viwi.bb
+++ b/_to_remove/recipes-apis/agl-service-can-high-level-viwi/agl-service-can-high-level-viwi.bb
diff --git a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb b/_to_remove/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
index 6ac2f4f29..6ac2f4f29 100644
--- a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
+++ b/_to_remove/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
diff --git a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend b/_to_remove/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend
index bc2d0d357..bc2d0d357 100644
--- a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend
+++ b/_to_remove/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend
diff --git a/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb b/_to_remove/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb
index cc50bfe2a..cc50bfe2a 100644
--- a/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb
+++ b/_to_remove/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb
diff --git a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.conf b/_to_remove/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.conf
index c89cc4d87..c89cc4d87 100644
--- a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.conf
+++ b/_to_remove/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.conf
diff --git a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.service b/_to_remove/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.service
index 0436716cb..0436716cb 100644
--- a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.service
+++ b/_to_remove/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.service
diff --git a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.sh b/_to_remove/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.sh
index c81014f3e..c81014f3e 100644
--- a/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.sh
+++ b/_to_remove/recipes-apis/agl-service-can-low-level/files/can-dev-mapping-helper.sh
diff --git a/recipes-apis/agl-service-can-low-level/files/run-ptest b/_to_remove/recipes-apis/agl-service-can-low-level/files/run-ptest
index cc9c41365..cc9c41365 100644
--- a/recipes-apis/agl-service-can-low-level/files/run-ptest
+++ b/_to_remove/recipes-apis/agl-service-can-low-level/files/run-ptest
diff --git a/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb b/_to_remove/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb
index 7281a59f0..7281a59f0 100644
--- a/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb
+++ b/_to_remove/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb
diff --git a/recipes-apis/agl-service-cloudproxy/libcloudproxy_git.bb b/_to_remove/recipes-apis/agl-service-cloudproxy/libcloudproxy_git.bb
index dddfcc8d6..dddfcc8d6 100644
--- a/recipes-apis/agl-service-cloudproxy/libcloudproxy_git.bb
+++ b/_to_remove/recipes-apis/agl-service-cloudproxy/libcloudproxy_git.bb
diff --git a/recipes-apis/agl-service-data-persistence/agl-service-data-persistence_git.bb b/_to_remove/recipes-apis/agl-service-data-persistence/agl-service-data-persistence_git.bb
index 569f0707e..569f0707e 100644
--- a/recipes-apis/agl-service-data-persistence/agl-service-data-persistence_git.bb
+++ b/_to_remove/recipes-apis/agl-service-data-persistence/agl-service-data-persistence_git.bb
diff --git a/recipes-apis/agl-service-geoclue/agl-service-geoclue_git.bb b/_to_remove/recipes-apis/agl-service-geoclue/agl-service-geoclue_git.bb
index a12923247..a12923247 100644
--- a/recipes-apis/agl-service-geoclue/agl-service-geoclue_git.bb
+++ b/_to_remove/recipes-apis/agl-service-geoclue/agl-service-geoclue_git.bb
diff --git a/recipes-apis/agl-service-geofence/agl-service-geofence_git.bb b/_to_remove/recipes-apis/agl-service-geofence/agl-service-geofence_git.bb
index 05f7f0eaa..05f7f0eaa 100644
--- a/recipes-apis/agl-service-geofence/agl-service-geofence_git.bb
+++ b/_to_remove/recipes-apis/agl-service-geofence/agl-service-geofence_git.bb
diff --git a/recipes-apis/agl-service-gps/agl-service-gps_git.bb b/_to_remove/recipes-apis/agl-service-gps/agl-service-gps_git.bb
index dfa7b3ebf..dfa7b3ebf 100644
--- a/recipes-apis/agl-service-gps/agl-service-gps_git.bb
+++ b/_to_remove/recipes-apis/agl-service-gps/agl-service-gps_git.bb
diff --git a/recipes-apis/agl-service-homescreen/agl-service-homescreen_git.bb b/_to_remove/recipes-apis/agl-service-homescreen/agl-service-homescreen_git.bb
index 7d2661bc0..7d2661bc0 100644
--- a/recipes-apis/agl-service-homescreen/agl-service-homescreen_git.bb
+++ b/_to_remove/recipes-apis/agl-service-homescreen/agl-service-homescreen_git.bb
diff --git a/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb b/_to_remove/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb
index 4078c6107..4078c6107 100644
--- a/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb
+++ b/_to_remove/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb
diff --git a/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb b/_to_remove/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb
index 8d1399c60..8d1399c60 100644
--- a/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb
+++ b/_to_remove/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb
diff --git a/recipes-apis/agl-service-identity-agent/agl-service-identity-agent_git.bb b/_to_remove/recipes-apis/agl-service-identity-agent/agl-service-identity-agent_git.bb
index f2474be7b..f2474be7b 100644
--- a/recipes-apis/agl-service-identity-agent/agl-service-identity-agent_git.bb
+++ b/_to_remove/recipes-apis/agl-service-identity-agent/agl-service-identity-agent_git.bb
diff --git a/recipes-apis/agl-service-iiodevices/agl-service-iiodevices_git.bb b/_to_remove/recipes-apis/agl-service-iiodevices/agl-service-iiodevices_git.bb
index 600f9103a..600f9103a 100644
--- a/recipes-apis/agl-service-iiodevices/agl-service-iiodevices_git.bb
+++ b/_to_remove/recipes-apis/agl-service-iiodevices/agl-service-iiodevices_git.bb
diff --git a/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb b/_to_remove/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb
index c7d695f25..c7d695f25 100644
--- a/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb
+++ b/_to_remove/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb
diff --git a/recipes-apis/agl-service-mediascanner/agl-service-mediascanner_git.bb b/_to_remove/recipes-apis/agl-service-mediascanner/agl-service-mediascanner_git.bb
index 1013ab693..1013ab693 100644
--- a/recipes-apis/agl-service-mediascanner/agl-service-mediascanner_git.bb
+++ b/_to_remove/recipes-apis/agl-service-mediascanner/agl-service-mediascanner_git.bb
diff --git a/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb b/_to_remove/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb
index 2d40d15ee..2d40d15ee 100755
--- a/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb
+++ b/_to_remove/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb
diff --git a/recipes-apis/agl-service-network/agl-service-network_git.bb b/_to_remove/recipes-apis/agl-service-network/agl-service-network_git.bb
index 3599e3cd7..3599e3cd7 100644
--- a/recipes-apis/agl-service-network/agl-service-network_git.bb
+++ b/_to_remove/recipes-apis/agl-service-network/agl-service-network_git.bb
diff --git a/recipes-apis/agl-service-nfc/agl-service-nfc_git.bb b/_to_remove/recipes-apis/agl-service-nfc/agl-service-nfc_git.bb
index 1757dcb38..1757dcb38 100644
--- a/recipes-apis/agl-service-nfc/agl-service-nfc_git.bb
+++ b/_to_remove/recipes-apis/agl-service-nfc/agl-service-nfc_git.bb
diff --git a/recipes-apis/agl-service-platform-info/agl-service-platform-info_git.bb b/_to_remove/recipes-apis/agl-service-platform-info/agl-service-platform-info_git.bb
index 43eed3f2e..43eed3f2e 100644
--- a/recipes-apis/agl-service-platform-info/agl-service-platform-info_git.bb
+++ b/_to_remove/recipes-apis/agl-service-platform-info/agl-service-platform-info_git.bb
diff --git a/recipes-apis/agl-service-radio/agl-service-radio_git.bb b/_to_remove/recipes-apis/agl-service-radio/agl-service-radio_git.bb
index a46ce128c..a46ce128c 100644
--- a/recipes-apis/agl-service-radio/agl-service-radio_git.bb
+++ b/_to_remove/recipes-apis/agl-service-radio/agl-service-radio_git.bb
diff --git a/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb b/_to_remove/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb
index 8f79527e6..8f79527e6 100644
--- a/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb
+++ b/_to_remove/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb
diff --git a/recipes-apis/agl-service-signal-composer/files/run-ptest b/_to_remove/recipes-apis/agl-service-signal-composer/files/run-ptest
index 49187ad85..49187ad85 100644
--- a/recipes-apis/agl-service-signal-composer/files/run-ptest
+++ b/_to_remove/recipes-apis/agl-service-signal-composer/files/run-ptest
diff --git a/recipes-apis/agl-service-taskmanager/agl-service-taskmanager.bb b/_to_remove/recipes-apis/agl-service-taskmanager/agl-service-taskmanager.bb
index 6c5a18107..6c5a18107 100644
--- a/recipes-apis/agl-service-taskmanager/agl-service-taskmanager.bb
+++ b/_to_remove/recipes-apis/agl-service-taskmanager/agl-service-taskmanager.bb
diff --git a/recipes-apis/agl-service-telephony/agl-service-telephony_git.bb b/_to_remove/recipes-apis/agl-service-telephony/agl-service-telephony_git.bb
index 656d76e0c..656d76e0c 100644
--- a/recipes-apis/agl-service-telephony/agl-service-telephony_git.bb
+++ b/_to_remove/recipes-apis/agl-service-telephony/agl-service-telephony_git.bb
diff --git a/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb b/_to_remove/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb
index 90df1dc48..90df1dc48 100644
--- a/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb
+++ b/_to_remove/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb
diff --git a/recipes-apis/agl-service-unicens/agl-service-unicens_git.bb b/_to_remove/recipes-apis/agl-service-unicens/agl-service-unicens_git.bb
index b6f006e39..b6f006e39 100644
--- a/recipes-apis/agl-service-unicens/agl-service-unicens_git.bb
+++ b/_to_remove/recipes-apis/agl-service-unicens/agl-service-unicens_git.bb
diff --git a/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb b/_to_remove/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb
index 0ab1f3d8f..0ab1f3d8f 100644
--- a/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb
+++ b/_to_remove/recipes-apis/agl-service-voice-high-capabilities/agl-service-voice-high-capabilities_git.bb
diff --git a/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb b/_to_remove/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
index 54620144a..54620144a 100644
--- a/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
+++ b/_to_remove/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
diff --git a/recipes-apis/agl-service-voice-high/default-voice-high-config/voice-high.json b/_to_remove/recipes-apis/agl-service-voice-high/default-voice-high-config/voice-high.json
index 1b72b8c85..1b72b8c85 100644
--- a/recipes-apis/agl-service-voice-high/default-voice-high-config/voice-high.json
+++ b/_to_remove/recipes-apis/agl-service-voice-high/default-voice-high-config/voice-high.json
diff --git a/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb b/_to_remove/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb
index caa66188f..caa66188f 100644
--- a/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb
+++ b/_to_remove/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb
diff --git a/recipes-apis/agl-service-weather/agl-service-weather_git.bb b/_to_remove/recipes-apis/agl-service-weather/agl-service-weather_git.bb
index abc401f93..abc401f93 100644
--- a/recipes-apis/agl-service-weather/agl-service-weather_git.bb
+++ b/_to_remove/recipes-apis/agl-service-weather/agl-service-weather_git.bb
diff --git a/recipes-config/cluster-dashboard-demo-config/cluster-dashboard-demo-config_1.0.bb b/_to_remove/recipes-config/cluster-dashboard-demo-config/cluster-dashboard-demo-config_1.0.bb
index f1fce78f8..f1fce78f8 100644
--- a/recipes-config/cluster-dashboard-demo-config/cluster-dashboard-demo-config_1.0.bb
+++ b/_to_remove/recipes-config/cluster-dashboard-demo-config/cluster-dashboard-demo-config_1.0.bb
diff --git a/recipes-config/cluster-dashboard-demo-config/files/AGL.conf.cluster b/_to_remove/recipes-config/cluster-dashboard-demo-config/files/AGL.conf.cluster
index dd8a912c5..dd8a912c5 100644
--- a/recipes-config/cluster-dashboard-demo-config/files/AGL.conf.cluster
+++ b/_to_remove/recipes-config/cluster-dashboard-demo-config/files/AGL.conf.cluster
diff --git a/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb b/_to_remove/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb
index 8d737282d..8d737282d 100644
--- a/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb
+++ b/_to_remove/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb
diff --git a/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.sh b/_to_remove/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.sh
index 3f538175f..3f538175f 100644
--- a/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.sh
+++ b/_to_remove/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf.sh
diff --git a/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf@.service b/_to_remove/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf@.service
index 5fc29b7a0..5fc29b7a0 100644
--- a/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf@.service
+++ b/_to_remove/recipes-config/cluster-demo-network-config/files/cluster-demo-network-conf@.service
diff --git a/recipes-config/cluster-demo-simulator/cluster-demo-simulator.bb b/_to_remove/recipes-config/cluster-demo-simulator/cluster-demo-simulator.bb
index 2eaabc979..2eaabc979 100644
--- a/recipes-config/cluster-demo-simulator/cluster-demo-simulator.bb
+++ b/_to_remove/recipes-config/cluster-demo-simulator/cluster-demo-simulator.bb
diff --git a/recipes-config/cluster-demo-simulator/files/cluster-demo-simulator.service b/_to_remove/recipes-config/cluster-demo-simulator/files/cluster-demo-simulator.service
index 04d41c6cf..04d41c6cf 100644
--- a/recipes-config/cluster-demo-simulator/files/cluster-demo-simulator.service
+++ b/_to_remove/recipes-config/cluster-demo-simulator/files/cluster-demo-simulator.service
diff --git a/recipes-config/cluster-demo-simulator/files/simple_can_simulator.py b/_to_remove/recipes-config/cluster-demo-simulator/files/simple_can_simulator.py
index 83f88706e..83f88706e 100755
--- a/recipes-config/cluster-demo-simulator/files/simple_can_simulator.py
+++ b/_to_remove/recipes-config/cluster-demo-simulator/files/simple_can_simulator.py
diff --git a/recipes-config/cluster-lin-bridging-config/cluster-lin-bridging-config.bb b/_to_remove/recipes-config/cluster-lin-bridging-config/cluster-lin-bridging-config.bb
index 5366f2d0b..5366f2d0b 100644
--- a/recipes-config/cluster-lin-bridging-config/cluster-lin-bridging-config.bb
+++ b/_to_remove/recipes-config/cluster-lin-bridging-config/cluster-lin-bridging-config.bb
diff --git a/recipes-config/cluster-lin-bridging-config/files/cluster-lin-bridging.service b/_to_remove/recipes-config/cluster-lin-bridging-config/files/cluster-lin-bridging.service
index 1dde33786..1dde33786 100644
--- a/recipes-config/cluster-lin-bridging-config/files/cluster-lin-bridging.service
+++ b/_to_remove/recipes-config/cluster-lin-bridging-config/files/cluster-lin-bridging.service
diff --git a/recipes-config/dev-mapping/dev-mapping-ci/dev-mapping.conf.ci b/_to_remove/recipes-config/dev-mapping/dev-mapping-ci/dev-mapping.conf.ci
index bd5c2135a..bd5c2135a 100644
--- a/recipes-config/dev-mapping/dev-mapping-ci/dev-mapping.conf.ci
+++ b/_to_remove/recipes-config/dev-mapping/dev-mapping-ci/dev-mapping.conf.ci
diff --git a/recipes-config/dev-mapping/dev-mapping-ci_1.0.bb b/_to_remove/recipes-config/dev-mapping/dev-mapping-ci_1.0.bb
index 7b40e40c6..7b40e40c6 100644
--- a/recipes-config/dev-mapping/dev-mapping-ci_1.0.bb
+++ b/_to_remove/recipes-config/dev-mapping/dev-mapping-ci_1.0.bb
diff --git a/recipes-config/dev-mapping/dev-mapping-demo/dev-mapping.conf.demo b/_to_remove/recipes-config/dev-mapping/dev-mapping-demo/dev-mapping.conf.demo
index 1fd12ad03..1fd12ad03 100644
--- a/recipes-config/dev-mapping/dev-mapping-demo/dev-mapping.conf.demo
+++ b/_to_remove/recipes-config/dev-mapping/dev-mapping-demo/dev-mapping.conf.demo
diff --git a/recipes-config/dev-mapping/dev-mapping-demo_1.0.bb b/_to_remove/recipes-config/dev-mapping/dev-mapping-demo_1.0.bb
index 23fdc078a..23fdc078a 100644
--- a/recipes-config/dev-mapping/dev-mapping-demo_1.0.bb
+++ b/_to_remove/recipes-config/dev-mapping/dev-mapping-demo_1.0.bb
diff --git a/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default b/_to_remove/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default
index 8519a5873..8519a5873 100644
--- a/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default
+++ b/_to_remove/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default
diff --git a/recipes-config/dev-mapping/dev-mapping_0.1.bb b/_to_remove/recipes-config/dev-mapping/dev-mapping_0.1.bb
index f880d39d8..f880d39d8 100644
--- a/recipes-config/dev-mapping/dev-mapping_0.1.bb
+++ b/_to_remove/recipes-config/dev-mapping/dev-mapping_0.1.bb
diff --git a/recipes-config/systemd-sync/systemd-agl-sync_1.0.bb b/_to_remove/recipes-config/systemd-sync/systemd-agl-sync_1.0.bb
index 0b2dc4e4d..0b2dc4e4d 100644
--- a/recipes-config/systemd-sync/systemd-agl-sync_1.0.bb
+++ b/_to_remove/recipes-config/systemd-sync/systemd-agl-sync_1.0.bb
diff --git a/recipes-config/unicens-config/files/55-inic.rules b/_to_remove/recipes-config/unicens-config/files/55-inic.rules
index 2da65cb80..2da65cb80 100644
--- a/recipes-config/unicens-config/files/55-inic.rules
+++ b/_to_remove/recipes-config/unicens-config/files/55-inic.rules
diff --git a/recipes-config/unicens-config/files/unicens-config.service b/_to_remove/recipes-config/unicens-config/files/unicens-config.service
index 43c8a1673..43c8a1673 100644
--- a/recipes-config/unicens-config/files/unicens-config.service
+++ b/_to_remove/recipes-config/unicens-config/files/unicens-config.service
diff --git a/recipes-config/unicens-config/files/unicens-config.sh b/_to_remove/recipes-config/unicens-config/files/unicens-config.sh
index 1f7fd3906..1f7fd3906 100644
--- a/recipes-config/unicens-config/files/unicens-config.sh
+++ b/_to_remove/recipes-config/unicens-config/files/unicens-config.sh
diff --git a/recipes-config/unicens-config/unicens-config.bb b/_to_remove/recipes-config/unicens-config/unicens-config.bb
index 57b93a76f..57b93a76f 100644
--- a/recipes-config/unicens-config/unicens-config.bb
+++ b/_to_remove/recipes-config/unicens-config/unicens-config.bb
diff --git a/recipes-connectivity/bluez-alsa/bluez-alsa/0001-utils-add-a-gstreamer-helper-application-for-interco.patch b/_to_remove/recipes-connectivity/bluez-alsa/bluez-alsa/0001-utils-add-a-gstreamer-helper-application-for-interco.patch
index 6c9a388c8..6c9a388c8 100644
--- a/recipes-connectivity/bluez-alsa/bluez-alsa/0001-utils-add-a-gstreamer-helper-application-for-interco.patch
+++ b/_to_remove/recipes-connectivity/bluez-alsa/bluez-alsa/0001-utils-add-a-gstreamer-helper-application-for-interco.patch
diff --git a/recipes-connectivity/bluez-alsa/bluez-alsa/bluealsa-gst-helper@.service b/_to_remove/recipes-connectivity/bluez-alsa/bluez-alsa/bluealsa-gst-helper@.service
index 495ab6222..495ab6222 100644
--- a/recipes-connectivity/bluez-alsa/bluez-alsa/bluealsa-gst-helper@.service
+++ b/_to_remove/recipes-connectivity/bluez-alsa/bluez-alsa/bluealsa-gst-helper@.service
diff --git a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb b/_to_remove/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb
index 27f462a87..27f462a87 100644
--- a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb
+++ b/_to_remove/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb
diff --git a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bbappend b/_to_remove/recipes-connectivity/bluez-alsa/bluez-alsa_git.bbappend
index b592e822b..b592e822b 100644
--- a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bbappend
+++ b/_to_remove/recipes-connectivity/bluez-alsa/bluez-alsa_git.bbappend
diff --git a/recipes-connectivity/bluez-alsa/files/bluez-alsa.service b/_to_remove/recipes-connectivity/bluez-alsa/files/bluez-alsa.service
index b59302ee4..b59302ee4 100644
--- a/recipes-connectivity/bluez-alsa/files/bluez-alsa.service
+++ b/_to_remove/recipes-connectivity/bluez-alsa/files/bluez-alsa.service
diff --git a/recipes-demo/alexa-viewer/alexa-viewer_git.bb b/_to_remove/recipes-demo/alexa-viewer/alexa-viewer_git.bb
index d8af6888c..d8af6888c 100644
--- a/recipes-demo/alexa-viewer/alexa-viewer_git.bb
+++ b/_to_remove/recipes-demo/alexa-viewer/alexa-viewer_git.bb
diff --git a/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb b/_to_remove/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb
index 4fe09e913..4fe09e913 100644
--- a/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb
+++ b/_to_remove/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb
diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/_to_remove/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
index 480d1f22d..480d1f22d 100644
--- a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
+++ b/_to_remove/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
diff --git a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb b/_to_remove/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
index 8b5b62093..8b5b62093 100644
--- a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
+++ b/_to_remove/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
diff --git a/recipes-demo/cluster-receiver/cluster-receiver_git.bb b/_to_remove/recipes-demo/cluster-receiver/cluster-receiver_git.bb
index 7028d5fc1..7028d5fc1 100644
--- a/recipes-demo/cluster-receiver/cluster-receiver_git.bb
+++ b/_to_remove/recipes-demo/cluster-receiver/cluster-receiver_git.bb
diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/_to_remove/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
index 80f8edbb0..80f8edbb0 100644
--- a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
+++ b/_to_remove/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
diff --git a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json b/_to_remove/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json
index 90180dcaf..90180dcaf 100644
--- a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json
+++ b/_to_remove/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json
diff --git a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json b/_to_remove/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json
index 5c6a5b35d..5c6a5b35d 100644
--- a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json
+++ b/_to_remove/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json
diff --git a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/roles.db b/_to_remove/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/roles.db
index 13702144a..13702144a 100644
--- a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/roles.db
+++ b/_to_remove/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf/roles.db
diff --git a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb b/_to_remove/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb
index f8cf9b928..f8cf9b928 100644
--- a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb
+++ b/_to_remove/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb
diff --git a/recipes-demo/dashboard/dashboard_git.bb b/_to_remove/recipes-demo/dashboard/dashboard_git.bb
index 22f5b73ec..22f5b73ec 100644
--- a/recipes-demo/dashboard/dashboard_git.bb
+++ b/_to_remove/recipes-demo/dashboard/dashboard_git.bb
diff --git a/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb b/_to_remove/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb
index d33356999..d33356999 100644
--- a/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb
+++ b/_to_remove/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb
diff --git a/_to_remove/recipes-demo/homescreen/homescreen_git.bb b/_to_remove/recipes-demo/homescreen/homescreen_git.bb
new file mode 100644
index 000000000..bf8034b91
--- /dev/null
+++ b/_to_remove/recipes-demo/homescreen/homescreen_git.bb
@@ -0,0 +1,43 @@
+SUMMARY     = "Home Screen application"
+DESCRIPTION = "AGL demonstration Home Screen application"
+HOMEPAGE    = "http://docs.automotivelinux.org"
+LICENSE     = "Apache-2.0"
+SECTION     = "apps"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
+
+DEPENDS = " \
+    qtbase \
+    qtdeclarative \
+    qtquickcontrols2 \
+    libqtappfw \
+    libhomescreen \
+    libafb-helpers-qt \
+    wayland-native \
+    wayland \
+    qtwayland \
+    qtwayland-native \
+    agl-compositor \
+"
+
+PV      = "1.0+git${SRCPV}"
+
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=https;branch=${AGL_BRANCH}"
+SRCREV  = "${AGL_APP_REVISION}"
+
+S       = "${WORKDIR}/git"
+
+inherit qmake5 systemd pkgconfig aglwgt
+
+PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
+
+OE_QMAKE_CXXFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
+
+RDEPENDS:${PN} += " \
+    libqtappfw \
+    agl-service-audiomixer \
+    agl-service-bluetooth \
+    agl-service-homescreen \
+    agl-service-network \
+    agl-service-weather \
+    agl-service-voice-high \
+"
diff --git a/recipes-demo/html5-background/html5-background_git.bb b/_to_remove/recipes-demo/html5-background/html5-background_git.bb
index 4be560709..4be560709 100644
--- a/recipes-demo/html5-background/html5-background_git.bb
+++ b/_to_remove/recipes-demo/html5-background/html5-background_git.bb
diff --git a/recipes-demo/html5-dashboard/html5-dashboard_git.bb b/_to_remove/recipes-demo/html5-dashboard/html5-dashboard_git.bb
index 7f375670b..7f375670b 100644
--- a/recipes-demo/html5-dashboard/html5-dashboard_git.bb
+++ b/_to_remove/recipes-demo/html5-dashboard/html5-dashboard_git.bb
diff --git a/recipes-demo/html5-homescreen/html5-homescreen_git.bb b/_to_remove/recipes-demo/html5-homescreen/html5-homescreen_git.bb
index f927cb70b..f927cb70b 100644
--- a/recipes-demo/html5-homescreen/html5-homescreen_git.bb
+++ b/_to_remove/recipes-demo/html5-homescreen/html5-homescreen_git.bb
diff --git a/recipes-demo/html5-hvac/html5-hvac_git.bb b/_to_remove/recipes-demo/html5-hvac/html5-hvac_git.bb
index 91654b42b..91654b42b 100644
--- a/recipes-demo/html5-hvac/html5-hvac_git.bb
+++ b/_to_remove/recipes-demo/html5-hvac/html5-hvac_git.bb
diff --git a/recipes-demo/html5-launcher/html5-launcher_git.bb b/_to_remove/recipes-demo/html5-launcher/html5-launcher_git.bb
index ab99cf5f0..ab99cf5f0 100644
--- a/recipes-demo/html5-launcher/html5-launcher_git.bb
+++ b/_to_remove/recipes-demo/html5-launcher/html5-launcher_git.bb
diff --git a/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb b/_to_remove/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb
index ddb2ee29f..ddb2ee29f 100644
--- a/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb
+++ b/_to_remove/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb
diff --git a/recipes-demo/html5-mixer/html5-mixer_git.bb b/_to_remove/recipes-demo/html5-mixer/html5-mixer_git.bb
index e643c59c7..e643c59c7 100644
--- a/recipes-demo/html5-mixer/html5-mixer_git.bb
+++ b/_to_remove/recipes-demo/html5-mixer/html5-mixer_git.bb
diff --git a/recipes-demo/html5-settings/html5-settings_git.bb b/_to_remove/recipes-demo/html5-settings/html5-settings_git.bb
index 010c69105..010c69105 100644
--- a/recipes-demo/html5-settings/html5-settings_git.bb
+++ b/_to_remove/recipes-demo/html5-settings/html5-settings_git.bb
diff --git a/recipes-demo/hvac/hvac_git.bb b/_to_remove/recipes-demo/hvac/hvac_git.bb
index c7da0ef49..c7da0ef49 100644
--- a/recipes-demo/hvac/hvac_git.bb
+++ b/_to_remove/recipes-demo/hvac/hvac_git.bb
diff --git a/recipes-demo/inputeventmanager/inputeventmanager_git.bb b/_to_remove/recipes-demo/inputeventmanager/inputeventmanager_git.bb
index 8718f1844..8718f1844 100644
--- a/recipes-demo/inputeventmanager/inputeventmanager_git.bb
+++ b/_to_remove/recipes-demo/inputeventmanager/inputeventmanager_git.bb
diff --git a/recipes-demo/launcher/launcher_git.bb b/_to_remove/recipes-demo/launcher/launcher_git.bb
index d2de209a1..d2de209a1 100644
--- a/recipes-demo/launcher/launcher_git.bb
+++ b/_to_remove/recipes-demo/launcher/launcher_git.bb
diff --git a/recipes-demo/mediaplayer/mediaplayer_git.bb b/_to_remove/recipes-demo/mediaplayer/mediaplayer_git.bb
index f6538fdcf..f6538fdcf 100644
--- a/recipes-demo/mediaplayer/mediaplayer_git.bb
+++ b/_to_remove/recipes-demo/mediaplayer/mediaplayer_git.bb
diff --git a/recipes-demo/messaging/messaging_git.bb b/_to_remove/recipes-demo/messaging/messaging_git.bb
index 586996c75..586996c75 100644
--- a/recipes-demo/messaging/messaging_git.bb
+++ b/_to_remove/recipes-demo/messaging/messaging_git.bb
diff --git a/recipes-demo/mixer/mixer_git.bb b/_to_remove/recipes-demo/mixer/mixer_git.bb
index c99c04420..c99c04420 100644
--- a/recipes-demo/mixer/mixer_git.bb
+++ b/_to_remove/recipes-demo/mixer/mixer_git.bb
diff --git a/recipes-demo/navigation/ondemandnavi-config/naviconfig.ini b/_to_remove/recipes-demo/navigation/ondemandnavi-config/naviconfig.ini
index f99c4483d..f99c4483d 100644
--- a/recipes-demo/navigation/ondemandnavi-config/naviconfig.ini
+++ b/_to_remove/recipes-demo/navigation/ondemandnavi-config/naviconfig.ini
diff --git a/recipes-demo/navigation/ondemandnavi-config_1.0.bb b/_to_remove/recipes-demo/navigation/ondemandnavi-config_1.0.bb
index 212971f26..212971f26 100644
--- a/recipes-demo/navigation/ondemandnavi-config_1.0.bb
+++ b/_to_remove/recipes-demo/navigation/ondemandnavi-config_1.0.bb
diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/_to_remove/recipes-demo/navigation/ondemandnavi_git.bb
index 5264ba633..5264ba633 100644
--- a/recipes-demo/navigation/ondemandnavi_git.bb
+++ b/_to_remove/recipes-demo/navigation/ondemandnavi_git.bb
diff --git a/recipes-demo/navigation/poiapp-api-key_1.0.bb b/_to_remove/recipes-demo/navigation/poiapp-api-key_1.0.bb
index d353d7dd5..d353d7dd5 100644
--- a/recipes-demo/navigation/poiapp-api-key_1.0.bb
+++ b/_to_remove/recipes-demo/navigation/poiapp-api-key_1.0.bb
diff --git a/recipes-demo/navigation/poiapp/0001-add-display-permission.patch b/_to_remove/recipes-demo/navigation/poiapp/0001-add-display-permission.patch
index 25a8fc313..25a8fc313 100644
--- a/recipes-demo/navigation/poiapp/0001-add-display-permission.patch
+++ b/_to_remove/recipes-demo/navigation/poiapp/0001-add-display-permission.patch
diff --git a/recipes-demo/navigation/poiapp_git.bb b/_to_remove/recipes-demo/navigation/poiapp_git.bb
index 08e174f74..08e174f74 100644
--- a/recipes-demo/navigation/poiapp_git.bb
+++ b/_to_remove/recipes-demo/navigation/poiapp_git.bb
diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/_to_remove/recipes-demo/navigation/tbtnavi_git.bb
index a4f22545f..a4f22545f 100644
--- a/recipes-demo/navigation/tbtnavi_git.bb
+++ b/_to_remove/recipes-demo/navigation/tbtnavi_git.bb
diff --git a/recipes-demo/onscreenapp/onscreenapp_git.bb b/_to_remove/recipes-demo/onscreenapp/onscreenapp_git.bb
index 32a7a2db3..32a7a2db3 100644
--- a/recipes-demo/onscreenapp/onscreenapp_git.bb
+++ b/_to_remove/recipes-demo/onscreenapp/onscreenapp_git.bb
diff --git a/recipes-demo/phone/phone_git.bb b/_to_remove/recipes-demo/phone/phone_git.bb
index 71ef6ed7c..71ef6ed7c 100644
--- a/recipes-demo/phone/phone_git.bb
+++ b/_to_remove/recipes-demo/phone/phone_git.bb
diff --git a/recipes-demo/radio/files/presets-ALS.conf b/_to_remove/recipes-demo/radio/files/presets-ALS.conf
index ff5592272..ff5592272 100644
--- a/recipes-demo/radio/files/presets-ALS.conf
+++ b/_to_remove/recipes-demo/radio/files/presets-ALS.conf
diff --git a/recipes-demo/radio/files/presets-CES.conf b/_to_remove/recipes-demo/radio/files/presets-CES.conf
index 83caeffe1..83caeffe1 100644
--- a/recipes-demo/radio/files/presets-CES.conf
+++ b/_to_remove/recipes-demo/radio/files/presets-CES.conf
diff --git a/recipes-demo/radio/files/presets-FOSDEM.conf b/_to_remove/recipes-demo/radio/files/presets-FOSDEM.conf
index b88364f72..b88364f72 100644
--- a/recipes-demo/radio/files/presets-FOSDEM.conf
+++ b/_to_remove/recipes-demo/radio/files/presets-FOSDEM.conf
diff --git a/recipes-demo/radio/radio_git.bb b/_to_remove/recipes-demo/radio/radio_git.bb
index c635f2c35..c635f2c35 100644
--- a/recipes-demo/radio/radio_git.bb
+++ b/_to_remove/recipes-demo/radio/radio_git.bb
diff --git a/recipes-demo/settings/settings_git.bb b/_to_remove/recipes-demo/settings/settings_git.bb
index 60cbdf595..60cbdf595 100644
--- a/recipes-demo/settings/settings_git.bb
+++ b/_to_remove/recipes-demo/settings/settings_git.bb
diff --git a/recipes-demo/simple-can-simulator/files/simple_can_simulator.py b/_to_remove/recipes-demo/simple-can-simulator/files/simple_can_simulator.py
index 83f88706e..83f88706e 100755
--- a/recipes-demo/simple-can-simulator/files/simple_can_simulator.py
+++ b/_to_remove/recipes-demo/simple-can-simulator/files/simple_can_simulator.py
diff --git a/recipes-demo/simple-can-simulator/simple-can-simulator.bb b/_to_remove/recipes-demo/simple-can-simulator/simple-can-simulator.bb
index 947e0c6a5..947e0c6a5 100644
--- a/recipes-demo/simple-can-simulator/simple-can-simulator.bb
+++ b/_to_remove/recipes-demo/simple-can-simulator/simple-can-simulator.bb
diff --git a/recipes-demo/taskmanager/taskmanager_git.bb b/_to_remove/recipes-demo/taskmanager/taskmanager_git.bb
index 96b6d270f..96b6d270f 100644
--- a/recipes-demo/taskmanager/taskmanager_git.bb
+++ b/_to_remove/recipes-demo/taskmanager/taskmanager_git.bb
diff --git a/recipes-demo/telematics-recorder/telematics-recorder_git.bb b/_to_remove/recipes-demo/telematics-recorder/telematics-recorder_git.bb
index 322acc5c3..322acc5c3 100644
--- a/recipes-demo/telematics-recorder/telematics-recorder_git.bb
+++ b/_to_remove/recipes-demo/telematics-recorder/telematics-recorder_git.bb
diff --git a/recipes-demo/waltham-receiver/waltham-receiver_git.bb b/_to_remove/recipes-demo/waltham-receiver/waltham-receiver_git.bb
index 75ada4dd1..75ada4dd1 100644
--- a/recipes-demo/waltham-receiver/waltham-receiver_git.bb
+++ b/_to_remove/recipes-demo/waltham-receiver/waltham-receiver_git.bb
diff --git a/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb b/_to_remove/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb
index 4c0bda071..4c0bda071 100644
--- a/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb
+++ b/_to_remove/recipes-devtools/low-level-can-generator/low-level-can-generator_git.bb
diff --git a/recipes-devtools/python/python3-asyncssh_2.3.0.bb b/_to_remove/recipes-devtools/python/python3-asyncssh_2.3.0.bb
index f764b5545..f764b5545 100644
--- a/recipes-devtools/python/python3-asyncssh_2.3.0.bb
+++ b/_to_remove/recipes-devtools/python/python3-asyncssh_2.3.0.bb
diff --git a/recipes-devtools/python/python3-pytest-dependency_0.5.1.bb b/_to_remove/recipes-devtools/python/python3-pytest-dependency_0.5.1.bb
index 5ff2d4ecf..5ff2d4ecf 100644
--- a/recipes-devtools/python/python3-pytest-dependency_0.5.1.bb
+++ b/_to_remove/recipes-devtools/python/python3-pytest-dependency_0.5.1.bb
diff --git a/recipes-devtools/python/python3-pytest-reverse_1.0.1.bb b/_to_remove/recipes-devtools/python/python3-pytest-reverse_1.0.1.bb
index 5ed9b1d9d..5ed9b1d9d 100644
--- a/recipes-devtools/python/python3-pytest-reverse_1.0.1.bb
+++ b/_to_remove/recipes-devtools/python/python3-pytest-reverse_1.0.1.bb
diff --git a/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts b/_to_remove/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts
index 1d1a5a059..1d1a5a059 100755
--- a/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts
+++ b/_to_remove/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts
diff --git a/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service b/_to_remove/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service
index 8f8667db6..8f8667db6 100644
--- a/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service
+++ b/_to_remove/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service
diff --git a/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb b/_to_remove/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
index e7b916360..e7b916360 100644
--- a/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
+++ b/_to_remove/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bb
diff --git a/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bbappend b/_to_remove/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bbappend
index 32e3d6b88..32e3d6b88 100644
--- a/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bbappend
+++ b/_to_remove/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bbappend
diff --git a/recipes-graphics/hmi-debug/files/hmi-debug b/_to_remove/recipes-graphics/hmi-debug/files/hmi-debug
index fee9573b7..fee9573b7 100644
--- a/recipes-graphics/hmi-debug/files/hmi-debug
+++ b/_to_remove/recipes-graphics/hmi-debug/files/hmi-debug
diff --git a/recipes-graphics/hmi-debug/hmi-debug_git.bb b/_to_remove/recipes-graphics/hmi-debug/hmi-debug_git.bb
index 84dff74ae..84dff74ae 100644
--- a/recipes-graphics/hmi-debug/hmi-debug_git.bb
+++ b/_to_remove/recipes-graphics/hmi-debug/hmi-debug_git.bb
diff --git a/recipes-graphics/libhomescreen/libhomescreen_git.bb b/_to_remove/recipes-graphics/libhomescreen/libhomescreen_git.bb
index 483b11eb7..483b11eb7 100644
--- a/recipes-graphics/libhomescreen/libhomescreen_git.bb
+++ b/_to_remove/recipes-graphics/libhomescreen/libhomescreen_git.bb
diff --git a/recipes-graphics/qlibhomescreen/qlibhomescreen_git.bb b/_to_remove/recipes-graphics/qlibhomescreen/qlibhomescreen_git.bb
index a9f1ccf37..a9f1ccf37 100644
--- a/recipes-graphics/qlibhomescreen/qlibhomescreen_git.bb
+++ b/_to_remove/recipes-graphics/qlibhomescreen/qlibhomescreen_git.bb
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/_to_remove/recipes-graphics/wayland/weston-init.bbappend
index 8af3184af..8af3184af 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/_to_remove/recipes-graphics/wayland/weston-init.bbappend
diff --git a/recipes-graphics/wayland/weston-init/tmpfiles.conf.in b/_to_remove/recipes-graphics/wayland/weston-init/tmpfiles.conf.in
index c4b302faf..c4b302faf 100644
--- a/recipes-graphics/wayland/weston-init/tmpfiles.conf.in
+++ b/_to_remove/recipes-graphics/wayland/weston-init/tmpfiles.conf.in
diff --git a/recipes-graphics/wayland/weston-init/weston-dep.conf.in b/_to_remove/recipes-graphics/wayland/weston-init/weston-dep.conf.in
index 2b8102096..2b8102096 100644
--- a/recipes-graphics/wayland/weston-init/weston-dep.conf.in
+++ b/_to_remove/recipes-graphics/wayland/weston-init/weston-dep.conf.in
diff --git a/recipes-graphics/wayland/weston-init/weston.conf.in b/_to_remove/recipes-graphics/wayland/weston-init/weston.conf.in
index 9c3df052d..9c3df052d 100644
--- a/recipes-graphics/wayland/weston-init/weston.conf.in
+++ b/_to_remove/recipes-graphics/wayland/weston-init/weston.conf.in
diff --git a/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in b/_to_remove/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in
index 585db6be8..585db6be8 100644
--- a/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in
+++ b/_to_remove/recipes-graphics/wayland/weston-init/zz-dri-imx.rules.in
diff --git a/recipes-graphics/wayland/weston-init/zz-dri.rules.in b/_to_remove/recipes-graphics/wayland/weston-init/zz-dri.rules.in
index 51c68c303..51c68c303 100644
--- a/recipes-graphics/wayland/weston-init/zz-dri.rules.in
+++ b/_to_remove/recipes-graphics/wayland/weston-init/zz-dri.rules.in
diff --git a/recipes-graphics/wayland/weston-init/zz-input.rules.in b/_to_remove/recipes-graphics/wayland/weston-init/zz-input.rules.in
index fb3e677f4..fb3e677f4 100644
--- a/recipes-graphics/wayland/weston-init/zz-input.rules.in
+++ b/_to_remove/recipes-graphics/wayland/weston-init/zz-input.rules.in
diff --git a/recipes-graphics/wayland/weston-init/zz-tty.rules.in b/_to_remove/recipes-graphics/wayland/weston-init/zz-tty.rules.in
index e5ce4b553..e5ce4b553 100644
--- a/recipes-graphics/wayland/weston-init/zz-tty.rules.in
+++ b/_to_remove/recipes-graphics/wayland/weston-init/zz-tty.rules.in
diff --git a/recipes-graphics/wayland/weston-init/zz-video.rules.in b/_to_remove/recipes-graphics/wayland/weston-init/zz-video.rules.in
index 1dfa3c18c..1dfa3c18c 100644
--- a/recipes-graphics/wayland/weston-init/zz-video.rules.in
+++ b/_to_remove/recipes-graphics/wayland/weston-init/zz-video.rules.in
diff --git a/recipes-graphics/wayland/weston-init_agldemo.inc b/_to_remove/recipes-graphics/wayland/weston-init_agldemo.inc
index 4815079f2..4815079f2 100644
--- a/recipes-graphics/wayland/weston-init_agldemo.inc
+++ b/_to_remove/recipes-graphics/wayland/weston-init_agldemo.inc
diff --git a/recipes-kernel/most/files/0002-src-most-add-auto-conf-feature.patch b/_to_remove/recipes-kernel/most/files/0002-src-most-add-auto-conf-feature.patch
index dd811c81b..dd811c81b 100644
--- a/recipes-kernel/most/files/0002-src-most-add-auto-conf-feature.patch
+++ b/_to_remove/recipes-kernel/most/files/0002-src-most-add-auto-conf-feature.patch
diff --git a/recipes-kernel/most/files/0003-core-remove-kernel-log-for-MBO-status.patch b/_to_remove/recipes-kernel/most/files/0003-core-remove-kernel-log-for-MBO-status.patch
index 4703844a1..4703844a1 100644
--- a/recipes-kernel/most/files/0003-core-remove-kernel-log-for-MBO-status.patch
+++ b/_to_remove/recipes-kernel/most/files/0003-core-remove-kernel-log-for-MBO-status.patch
diff --git a/recipes-kernel/most/files/0004-most-video-set-device_caps.patch b/_to_remove/recipes-kernel/most/files/0004-most-video-set-device_caps.patch
index 010d4b0d0..010d4b0d0 100644
--- a/recipes-kernel/most/files/0004-most-video-set-device_caps.patch
+++ b/_to_remove/recipes-kernel/most/files/0004-most-video-set-device_caps.patch
diff --git a/recipes-kernel/most/files/0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch b/_to_remove/recipes-kernel/most/files/0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch
index ebaee9e14..ebaee9e14 100644
--- a/recipes-kernel/most/files/0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch
+++ b/_to_remove/recipes-kernel/most/files/0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch
diff --git a/recipes-kernel/most/files/0006-dim2-fix-startup-sequence.patch b/_to_remove/recipes-kernel/most/files/0006-dim2-fix-startup-sequence.patch
index 59c6ae671..59c6ae671 100644
--- a/recipes-kernel/most/files/0006-dim2-fix-startup-sequence.patch
+++ b/_to_remove/recipes-kernel/most/files/0006-dim2-fix-startup-sequence.patch
diff --git a/recipes-kernel/most/files/0007-dim2-use-device-tree.patch b/_to_remove/recipes-kernel/most/files/0007-dim2-use-device-tree.patch
index 679fab79c..679fab79c 100644
--- a/recipes-kernel/most/files/0007-dim2-use-device-tree.patch
+++ b/_to_remove/recipes-kernel/most/files/0007-dim2-use-device-tree.patch
diff --git a/recipes-kernel/most/files/0008-dim2-read-clock-speed-from-the-device-tree.patch b/_to_remove/recipes-kernel/most/files/0008-dim2-read-clock-speed-from-the-device-tree.patch
index 1b01fb156..1b01fb156 100644
--- a/recipes-kernel/most/files/0008-dim2-read-clock-speed-from-the-device-tree.patch
+++ b/_to_remove/recipes-kernel/most/files/0008-dim2-read-clock-speed-from-the-device-tree.patch
diff --git a/recipes-kernel/most/files/0009-dim2-use-device-for-coherent-memory-allocation.patch b/_to_remove/recipes-kernel/most/files/0009-dim2-use-device-for-coherent-memory-allocation.patch
index 08cd6f99d..08cd6f99d 100644
--- a/recipes-kernel/most/files/0009-dim2-use-device-for-coherent-memory-allocation.patch
+++ b/_to_remove/recipes-kernel/most/files/0009-dim2-use-device-for-coherent-memory-allocation.patch
diff --git a/recipes-kernel/most/files/0010-backport-usb-setup-timer.patch b/_to_remove/recipes-kernel/most/files/0010-backport-usb-setup-timer.patch
index ff21b2130..ff21b2130 100644
--- a/recipes-kernel/most/files/0010-backport-usb-setup-timer.patch
+++ b/_to_remove/recipes-kernel/most/files/0010-backport-usb-setup-timer.patch
diff --git a/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch b/_to_remove/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch
index d4383c4f6..d4383c4f6 100644
--- a/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch
+++ b/_to_remove/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch
diff --git a/recipes-kernel/most/files/0012-Fix-build-with-5.4-kernel.patch b/_to_remove/recipes-kernel/most/files/0012-Fix-build-with-5.4-kernel.patch
index 02eca27d2..02eca27d2 100644
--- a/recipes-kernel/most/files/0012-Fix-build-with-5.4-kernel.patch
+++ b/_to_remove/recipes-kernel/most/files/0012-Fix-build-with-5.4-kernel.patch
diff --git a/recipes-kernel/most/files/0013-Fix-build-with-5.7-kernel.patch b/_to_remove/recipes-kernel/most/files/0013-Fix-build-with-5.7-kernel.patch
index 85e38857c..85e38857c 100644
--- a/recipes-kernel/most/files/0013-Fix-build-with-5.7-kernel.patch
+++ b/_to_remove/recipes-kernel/most/files/0013-Fix-build-with-5.7-kernel.patch
diff --git a/recipes-kernel/most/files/0014-Fix-build-with-5.9-kernel.patch b/_to_remove/recipes-kernel/most/files/0014-Fix-build-with-5.9-kernel.patch
index fd430c9df..fd430c9df 100644
--- a/recipes-kernel/most/files/0014-Fix-build-with-5.9-kernel.patch
+++ b/_to_remove/recipes-kernel/most/files/0014-Fix-build-with-5.9-kernel.patch
diff --git a/recipes-kernel/most/most.bb b/_to_remove/recipes-kernel/most/most.bb
index f709a6d9a..f709a6d9a 100644
--- a/recipes-kernel/most/most.bb
+++ b/_to_remove/recipes-kernel/most/most.bb
diff --git a/recipes-kernel/most/most.bbappend b/_to_remove/recipes-kernel/most/most.bbappend
index af7ea687e..af7ea687e 100644
--- a/recipes-kernel/most/most.bbappend
+++ b/_to_remove/recipes-kernel/most/most.bbappend
diff --git a/recipes-kernel/sllin/files/0001-Disable-sllin-driver-debug-log.patch b/_to_remove/recipes-kernel/sllin/files/0001-Disable-sllin-driver-debug-log.patch
index 99d6183ab..99d6183ab 100644
--- a/recipes-kernel/sllin/files/0001-Disable-sllin-driver-debug-log.patch
+++ b/_to_remove/recipes-kernel/sllin/files/0001-Disable-sllin-driver-debug-log.patch
diff --git a/recipes-kernel/sllin/files/0001_update_makefile.patch b/_to_remove/recipes-kernel/sllin/files/0001_update_makefile.patch
index 7db57802b..7db57802b 100644
--- a/recipes-kernel/sllin/files/0001_update_makefile.patch
+++ b/_to_remove/recipes-kernel/sllin/files/0001_update_makefile.patch
diff --git a/recipes-kernel/sllin/files/0002_fix_null_operation_check.patch b/_to_remove/recipes-kernel/sllin/files/0002_fix_null_operation_check.patch
index 896e2680d..896e2680d 100644
--- a/recipes-kernel/sllin/files/0002_fix_null_operation_check.patch
+++ b/_to_remove/recipes-kernel/sllin/files/0002_fix_null_operation_check.patch
diff --git a/recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch b/_to_remove/recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch
index c8f2f9268..c8f2f9268 100644
--- a/recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch
+++ b/_to_remove/recipes-kernel/sllin/files/0003-Allow-recent-kernels-newer-4.11.x-to-build.patch
diff --git a/recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch b/_to_remove/recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch
index f3bcda9fe..f3bcda9fe 100644
--- a/recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch
+++ b/_to_remove/recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch
diff --git a/recipes-kernel/sllin/files/lin_config.conf b/_to_remove/recipes-kernel/sllin/files/lin_config.conf
index 9775b8b39..9775b8b39 100644
--- a/recipes-kernel/sllin/files/lin_config.conf
+++ b/_to_remove/recipes-kernel/sllin/files/lin_config.conf
diff --git a/recipes-kernel/sllin/files/sllin-demo.service b/_to_remove/recipes-kernel/sllin/files/sllin-demo.service
index e3e7432f3..e3e7432f3 100644
--- a/recipes-kernel/sllin/files/sllin-demo.service
+++ b/_to_remove/recipes-kernel/sllin/files/sllin-demo.service
diff --git a/recipes-kernel/sllin/files/start_lin_demo.sh b/_to_remove/recipes-kernel/sllin/files/start_lin_demo.sh
index c7627ca74..c7627ca74 100755
--- a/recipes-kernel/sllin/files/start_lin_demo.sh
+++ b/_to_remove/recipes-kernel/sllin/files/start_lin_demo.sh
diff --git a/recipes-kernel/sllin/sllin.bb b/_to_remove/recipes-kernel/sllin/sllin.bb
index cc72b3095..cc72b3095 100644
--- a/recipes-kernel/sllin/sllin.bb
+++ b/_to_remove/recipes-kernel/sllin/sllin.bb
diff --git a/recipes-qt/qt-cluster/qtcompositor-conf_1.0.bb b/_to_remove/recipes-qt/qt-cluster/qtcompositor-conf_1.0.bb
index 131210897..131210897 100644
--- a/recipes-qt/qt-cluster/qtcompositor-conf_1.0.bb
+++ b/_to_remove/recipes-qt/qt-cluster/qtcompositor-conf_1.0.bb
diff --git a/recipes-qt/qt-qrcode/qt-qrcode/0001-rework-library-build.patch b/_to_remove/recipes-qt/qt-qrcode/qt-qrcode/0001-rework-library-build.patch
index 76795268c..76795268c 100644
--- a/recipes-qt/qt-qrcode/qt-qrcode/0001-rework-library-build.patch
+++ b/_to_remove/recipes-qt/qt-qrcode/qt-qrcode/0001-rework-library-build.patch
diff --git a/recipes-qt/qt-qrcode/qt-qrcode/0002-fix-dangling-pointer.patch b/_to_remove/recipes-qt/qt-qrcode/qt-qrcode/0002-fix-dangling-pointer.patch
index 489a49edb..489a49edb 100644
--- a/recipes-qt/qt-qrcode/qt-qrcode/0002-fix-dangling-pointer.patch
+++ b/_to_remove/recipes-qt/qt-qrcode/qt-qrcode/0002-fix-dangling-pointer.patch
diff --git a/recipes-qt/qt-qrcode/qt-qrcode_git.bb b/_to_remove/recipes-qt/qt-qrcode/qt-qrcode_git.bb
index fcc71390d..fcc71390d 100644
--- a/recipes-qt/qt-qrcode/qt-qrcode_git.bb
+++ b/_to_remove/recipes-qt/qt-qrcode/qt-qrcode_git.bb
diff --git a/recipes-support/lin-config/files/0001-Change-Makefile-to-use-pkg-config-for-libxml-2.0.patch b/_to_remove/recipes-support/lin-config/files/0001-Change-Makefile-to-use-pkg-config-for-libxml-2.0.patch
index fe08b7d81..fe08b7d81 100644
--- a/recipes-support/lin-config/files/0001-Change-Makefile-to-use-pkg-config-for-libxml-2.0.patch
+++ b/_to_remove/recipes-support/lin-config/files/0001-Change-Makefile-to-use-pkg-config-for-libxml-2.0.patch
diff --git a/recipes-support/lin-config/files/0002-Change-Makefile-to-use-LDFLAGS.patch b/_to_remove/recipes-support/lin-config/files/0002-Change-Makefile-to-use-LDFLAGS.patch
index 26364455a..26364455a 100644
--- a/recipes-support/lin-config/files/0002-Change-Makefile-to-use-LDFLAGS.patch
+++ b/_to_remove/recipes-support/lin-config/files/0002-Change-Makefile-to-use-LDFLAGS.patch
diff --git a/recipes-support/lin-config/lin-config_git.bb b/_to_remove/recipes-support/lin-config/lin-config_git.bb
index 7585156f2..7585156f2 100644
--- a/recipes-support/lin-config/lin-config_git.bb
+++ b/_to_remove/recipes-support/lin-config/lin-config_git.bb
diff --git a/recipes-support/opencv/opencv_4.%.bbappend b/_to_remove/recipes-support/opencv/opencv_4.%.bbappend
index a1016a6d0..a1016a6d0 100644
--- a/recipes-support/opencv/opencv_4.%.bbappend
+++ b/_to_remove/recipes-support/opencv/opencv_4.%.bbappend
diff --git a/recipes-support/opencv/opencv_agldemo.inc b/_to_remove/recipes-support/opencv/opencv_agldemo.inc
index 16640023e..16640023e 100644
--- a/recipes-support/opencv/opencv_agldemo.inc
+++ b/_to_remove/recipes-support/opencv/opencv_agldemo.inc
diff --git a/recipes-test/gcovr-wrapper/gcovr-wrapper/gcovr-wrapper b/_to_remove/recipes-test/gcovr-wrapper/gcovr-wrapper/gcovr-wrapper
index 12580237d..12580237d 100644
--- a/recipes-test/gcovr-wrapper/gcovr-wrapper/gcovr-wrapper
+++ b/_to_remove/recipes-test/gcovr-wrapper/gcovr-wrapper/gcovr-wrapper
diff --git a/recipes-test/gcovr-wrapper/gcovr-wrapper_1.0.bb b/_to_remove/recipes-test/gcovr-wrapper/gcovr-wrapper_1.0.bb
index 8cb228d50..8cb228d50 100644
--- a/recipes-test/gcovr-wrapper/gcovr-wrapper_1.0.bb
+++ b/_to_remove/recipes-test/gcovr-wrapper/gcovr-wrapper_1.0.bb
diff --git a/recipes-test/gcovr/gcovr/0001-add-gcov-filter-source-errors-option.patch b/_to_remove/recipes-test/gcovr/gcovr/0001-add-gcov-filter-source-errors-option.patch
index be1dcf829..be1dcf829 100644
--- a/recipes-test/gcovr/gcovr/0001-add-gcov-filter-source-errors-option.patch
+++ b/_to_remove/recipes-test/gcovr/gcovr/0001-add-gcov-filter-source-errors-option.patch
diff --git a/recipes-test/gcovr/gcovr_%.bbappend b/_to_remove/recipes-test/gcovr/gcovr_%.bbappend
index 699aea214..699aea214 100644
--- a/recipes-test/gcovr/gcovr_%.bbappend
+++ b/_to_remove/recipes-test/gcovr/gcovr_%.bbappend
diff --git a/recipes-test/gcovr/gcovr_git.bb b/_to_remove/recipes-test/gcovr/gcovr_git.bb
index d302c0f63..d302c0f63 100644
--- a/recipes-test/gcovr/gcovr_git.bb
+++ b/_to_remove/recipes-test/gcovr/gcovr_git.bb
diff --git a/recipes-test/pyagl/pyagl_git.bb b/_to_remove/recipes-test/pyagl/pyagl_git.bb
index ee01ce52f..ee01ce52f 100644
--- a/recipes-test/pyagl/pyagl_git.bb
+++ b/_to_remove/recipes-test/pyagl/pyagl_git.bb
diff --git a/recipes-wam/chromium/chromium-browser-service.bb b/_to_remove/recipes-wam/chromium/chromium-browser-service.bb
index d9a4206d5..d9a4206d5 100644
--- a/recipes-wam/chromium/chromium-browser-service.bb
+++ b/_to_remove/recipes-wam/chromium/chromium-browser-service.bb
diff --git a/recipes-wam/chromium/chromium.inc b/_to_remove/recipes-wam/chromium/chromium.inc
index 722ba9a34..722ba9a34 100644
--- a/recipes-wam/chromium/chromium.inc
+++ b/_to_remove/recipes-wam/chromium/chromium.inc
diff --git a/recipes-wam/chromium/chromium84_git.bb b/_to_remove/recipes-wam/chromium/chromium84_git.bb
index 755c4ce92..755c4ce92 100644
--- a/recipes-wam/chromium/chromium84_git.bb
+++ b/_to_remove/recipes-wam/chromium/chromium84_git.bb
diff --git a/recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch b/_to_remove/recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch
index 20caccbf6..20caccbf6 100644
--- a/recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch
+++ b/_to_remove/recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch
diff --git a/recipes-wam/chromium/files/chromium-quiche-invalid-offsetof.patch b/_to_remove/recipes-wam/chromium/files/chromium-quiche-invalid-offsetof.patch
index 4fdd98de4..4fdd98de4 100644
--- a/recipes-wam/chromium/files/chromium-quiche-invalid-offsetof.patch
+++ b/_to_remove/recipes-wam/chromium/files/chromium-quiche-invalid-offsetof.patch
diff --git a/recipes-wam/chromium/files/chromium-skia-no_sanitize.patch b/_to_remove/recipes-wam/chromium/files/chromium-skia-no_sanitize.patch
index abfba57ab..abfba57ab 100644
--- a/recipes-wam/chromium/files/chromium-skia-no_sanitize.patch
+++ b/_to_remove/recipes-wam/chromium/files/chromium-skia-no_sanitize.patch
diff --git a/recipes-wam/chromium/gn-utils.inc b/_to_remove/recipes-wam/chromium/gn-utils.inc
index 156b56d2d..156b56d2d 100644
--- a/recipes-wam/chromium/gn-utils.inc
+++ b/_to_remove/recipes-wam/chromium/gn-utils.inc
diff --git a/recipes-wam/wam/files/WebAppMgr.env b/_to_remove/recipes-wam/wam/files/WebAppMgr.env
index c8ddc5173..c8ddc5173 100644
--- a/recipes-wam/wam/files/WebAppMgr.env
+++ b/_to_remove/recipes-wam/wam/files/WebAppMgr.env
diff --git a/recipes-wam/wam/files/WebAppMgr@.service b/_to_remove/recipes-wam/wam/files/WebAppMgr@.service
index beffd114c..beffd114c 100644
--- a/recipes-wam/wam/files/WebAppMgr@.service
+++ b/_to_remove/recipes-wam/wam/files/WebAppMgr@.service
diff --git a/recipes-wam/wam/files/trunc-webapp-roles.patch b/_to_remove/recipes-wam/wam/files/trunc-webapp-roles.patch
index 829abe07f..829abe07f 100644
--- a/recipes-wam/wam/files/trunc-webapp-roles.patch
+++ b/_to_remove/recipes-wam/wam/files/trunc-webapp-roles.patch
diff --git a/recipes-wam/wam/files/wam-user-setup.sh b/_to_remove/recipes-wam/wam/files/wam-user-setup.sh
index 515ea82ec..515ea82ec 100755
--- a/recipes-wam/wam/files/wam-user-setup.sh
+++ b/_to_remove/recipes-wam/wam/files/wam-user-setup.sh
diff --git a/recipes-wam/wam/files/wam-user-setup@.service b/_to_remove/recipes-wam/wam/files/wam-user-setup@.service
index f4814787d..f4814787d 100644
--- a/recipes-wam/wam/files/wam-user-setup@.service
+++ b/_to_remove/recipes-wam/wam/files/wam-user-setup@.service
diff --git a/recipes-wam/wam/wam_git.bb b/_to_remove/recipes-wam/wam/wam_git.bb
index 9de8573fa..9de8573fa 100644
--- a/recipes-wam/wam/wam_git.bb
+++ b/_to_remove/recipes-wam/wam/wam_git.bb
diff --git a/conf/include/agl-cloudproxy.inc b/conf/include/agl-cloudproxy.inc
deleted file mode 100644
index d62e3095f..000000000
--- a/conf/include/agl-cloudproxy.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Mask out recipes with older versions than those available in
-# meta-oe and meta-python
-BBMASK += "meta-iot-cloud/recipes-support/cjson/cjson_1.7.10.bb"
-BBMASK += "meta-iot-cloud/recipes-devtools/python/python3-httplib2_0.11.3.bb"
-BBMASK += "meta-iot-cloud/recipes-devtools/python/python3-xmltodict_0.11.0.bb"
diff --git a/conf/include/agl-demo-preload.inc b/conf/include/agl-demo-preload.inc
index a41168951..b6ae2ae2e 100644
--- a/conf/include/agl-demo-preload.inc
+++ b/conf/include/agl-demo-preload.inc
@@ -1,8 +1 @@
 AGL_FEATURES:append = " agl-demo-preload"
-
-# Use demo device mapping for low-can that enables sllin0
-PREFERRED_RPROVIDER_virtual/low-can-dev-mapping = "dev-mapping-demo"
-
-# Extend agl-voiceagent-alexa image feature to preload voiceagent
-# configuration package.
-FEATURE_PACKAGES_agl-voiceagent-alexa:append = " virtual/alexa-voiceagent-config"
diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index 99085c183..a47f41d70 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -12,19 +12,8 @@ IMAGE_INSTALL:append = " screen mc "
 # individually.
 IMAGE_INSTALL:append = " ${@'kernel-modules' if d.getVar('PREFERRED_PROVIDER_virtual/kernel') != 'linux-dummy' else ''}"
 
-# Extend agl-voiceagent-alexa image feature with local alexa-viewer
-# package.
-FEATURE_PACKAGES_agl-voiceagent-alexa:append = " alexa-viewer"
-
 # enable the layer
 AGL_FEATURES:append = " agldemo"
 
-# Set preferred provider for low-can device mapping configuration
-PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'dev-mapping-ci', 'dev-mapping', d)}"
-
-# voice api inclusion
-PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config"
-FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services"
-
 # install virtualbox drivers for vmdk
-IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"
+#IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"
diff --git a/conf/layer.conf b/conf/layer.conf
index f9ef8c6f2..e76256434 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,5 +11,5 @@ BBFILE_PRIORITY_agldemo = "70"
 
 LAYERSERIES_COMPAT_agldemo = "dunfell"
 
-LAYERDEPENDS_agldemo = "aglcore app-framework qt5-layer openembedded-layer"
+LAYERDEPENDS_agldemo = "aglcore qt5-layer openembedded-layer"
 
diff --git a/recipes-config/agl-login-manager/agl-login-manager_%.bbappend b/recipes-config/agl-login-manager/agl-login-manager_%.bbappend
deleted file mode 100644
index fe3a90317..000000000
--- a/recipes-config/agl-login-manager/agl-login-manager_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-LOGIN_USER ?= "1001"
diff --git a/recipes-config/agl-login-manager/agl-login-manager_0.1.bb b/recipes-config/agl-login-manager/agl-login-manager_0.1.bb
deleted file mode 100644
index 20ca12639..000000000
--- a/recipes-config/agl-login-manager/agl-login-manager_0.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "AGL Login manager"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-LOGIN_USER ??="1001 1002"
-
-RDEPENDS:${PN} += "af-main"
-
-do_install:append() {
-
-    install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
-
-    for AGL_USER in ${LOGIN_USER};do
-        ln -s ../afm-user-session@.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afm-user-session@${AGL_USER}.service
-    done
-}
-
-FILES:${PN} += "${systemd_system_unitdir}"
diff --git a/recipes-demo/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb
index bf8034b91..b53519e9a 100644
--- a/recipes-demo/homescreen/homescreen_git.bb
+++ b/recipes-demo/homescreen/homescreen_git.bb
@@ -4,40 +4,38 @@ HOMEPAGE    = "http://docs.automotivelinux.org"
 LICENSE     = "Apache-2.0"
 SECTION     = "apps"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
+#LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 DEPENDS = " \
     qtbase \
     qtdeclarative \
     qtquickcontrols2 \
-    libqtappfw \
-    libhomescreen \
-    libafb-helpers-qt \
     wayland-native \
     wayland \
     qtwayland \
     qtwayland-native \
     agl-compositor \
+    json-c \
+    qtwebsockets \
 "
 
 PV      = "1.0+git${SRCPV}"
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=https;nobranch=1"
+SRCREV  = "09b5eb1b42910e84612a37a0fb44629c73eee3e7"
 
 S       = "${WORKDIR}/git"
 
-inherit qmake5 systemd pkgconfig aglwgt
+inherit qmake5 systemd pkgconfig
 
 PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
 
 OE_QMAKE_CXXFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
 
-RDEPENDS:${PN} += " \
-    libqtappfw \
-    agl-service-audiomixer \
-    agl-service-bluetooth \
-    agl-service-homescreen \
-    agl-service-network \
-    agl-service-weather \
-    agl-service-voice-high \
-"
+
+do_install:append() {
+
+    install -d ${D}/${bindir}
+    install -m 0644 ${B}/homescreen/HomeScreen ${D}/${bindir}/homescreen
+
+}
\ No newline at end of file
diff --git a/recipes-platform/images/agl-cluster-demo-platform-crosssdk.bb b/recipes-platform/images/agl-cluster-demo-platform-crosssdk.bb
deleted file mode 100644
index 8251272cb..000000000
--- a/recipes-platform/images/agl-cluster-demo-platform-crosssdk.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Cross SDK of AGL Distribution for Cluster profile Demo"
-
-DESCRIPTION = "SDK image for AGL Distribution for Cluster profile Demo. \
-It includes the full meta-toolchain, plus developement headers and libraries \
-to form a standalone cross SDK."
-
-require agl-cluster-demo-platform.bb
-
-LICENSE = "MIT"
-
-IMAGE_FEATURES:append = " dev-pkgs"
-IMAGE_INSTALL:append = " kernel-dev kernel-devsrc"
-
-inherit populate_sdk populate_sdk_qt5
-
-# Task do_populate_sdk and do_rootfs can't be exec simultaneously.
-# Both exec "createrepo" on the same directory, and so one of them
-# can failed (randomly).
-addtask do_populate_sdk after do_rootfs
-
-# Add wayland-scanner to SDK (SPEC-945)
-# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup
-# wayland-scanner is in nativesdk-wayland-dev !
-# option: add also nativesdk-qtwayland-tools
-TOOLCHAIN_HOST_TASK:append = " nativesdk-wayland nativesdk-wayland-dev"
-
-TOOLCHAIN_HOST_TASK:append = " nativesdk-perl-modules "
diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-platform.bb
deleted file mode 100644
index 2e8be720c..000000000
--- a/recipes-platform/images/agl-cluster-demo-platform.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "AGL Cluster Demo Platform image currently contains a simple cluster interface."
-
-require agl-cluster-demo-platform.inc
-
-LICENSE = "MIT"
-
-IMAGE_FEATURES:append = ""
-
-# add packages for cluster demo platform (include demo apps) here
-IMAGE_INSTALL:append = " \
-    packagegroup-agl-cluster-demo-platform \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "cluster-dashboard-demo-config", "", d)} \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "weston-ini-conf-landscape-inverted", "weston-ini-conf-landscape", d)} \
-    "
-
diff --git a/recipes-platform/images/agl-cluster-demo-platform.inc b/recipes-platform/images/agl-cluster-demo-platform.inc
deleted file mode 100644
index 8745ca941..000000000
--- a/recipes-platform/images/agl-cluster-demo-platform.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Base image
-require recipes-platform/images/agl-image-cluster-qt5.inc
-
diff --git a/recipes-platform/images/agl-cluster-demo-qtcompositor.bb b/recipes-platform/images/agl-cluster-demo-qtcompositor.bb
deleted file mode 100644
index 0e9afb9c2..000000000
--- a/recipes-platform/images/agl-cluster-demo-qtcompositor.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "AGL Cluster Demo Qtwayland Compositor image currently contains a \
-simple cluster interface and some AGL service."
-
-require agl-cluster-demo-qtcompositor.inc
-
-LICENSE = "MIT"
-
-IMAGE_FEATURES:append = " \
-    "
-
-# add packages for cluster demo qtcompositor
-IMAGE_INSTALL:append = " \
-    packagegroup-agl-cluster-demo-qtcompositor \
-    "
-
diff --git a/recipes-platform/images/agl-cluster-demo-qtcompositor.inc b/recipes-platform/images/agl-cluster-demo-qtcompositor.inc
deleted file mode 100644
index 11c1ebce9..000000000
--- a/recipes-platform/images/agl-cluster-demo-qtcompositor.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Base image
-require recipes-platform/images/agl-image-cluster-qt5.inc
diff --git a/recipes-platform/images/agl-demo-platform-crosssdk.bb b/recipes-platform/images/agl-demo-platform-crosssdk.bb
deleted file mode 100644
index 7f98b41a4..000000000
--- a/recipes-platform/images/agl-demo-platform-crosssdk.bb
+++ /dev/null
@@ -1,70 +0,0 @@
-SUMMARY = "Cross SDK of Full AGL Distribution for IVI profile"
-
-DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \
-It includes the full meta-toolchain, plus developement headers and libraries \
-to form a standalone cross SDK."
-
-require agl-demo-platform.bb
-
-LICENSE = "MIT"
-
-require agl-image-graphical-qt5-crosssdk.inc
-
-inherit populate_sdk populate_sdk_qt5
-
-# Task do_populate_sdk and do_rootfs can't be exec simultaneously.
-# Both exec "createrepo" on the same directory, and so one of them
-# can failed (randomly).
-addtask do_populate_sdk after do_rootfs
-
-# Add mosquitto to support building the telematics demo application.
-# This is currently required for CI, as it uses agl-demo-platform-crosssdk
-# to build everything. An agenda item has been tabled for the May 2019 F2F
-# meeting to discuss the path forward (separate versus superset SDKs), this
-# should be reviewed after that.
-TOOLCHAIN_TARGET_TASK += "mosquitto-dev"
-
-# Add nlohmann-json to support building the speech services.
-# Required until either the agl-speech-framework feature is added as a
-# dependency of agl-demo, or the speech services are migrated into the
-# core profile.
-TOOLCHAIN_TARGET_TASK += "nlohmann-json-dev"
-
-# Add libstdc++-staticdev to support building agl-service-voice-high or
-# other users of the C++17 filesystem standard library feature.
-# Can be removed upon upgrade to gcc 9.x, as it will no longer be necessary.
-TOOLCHAIN_TARGET_TASK += "libstdc++-staticdev"
-
-# Add gcc-sanitizers to support building applications using the SDK with
-# AddressSanitizer support to detect use-after-frees along with other
-# memory issue.
-TOOLCHAIN_TARGET_TASK += "gcc-sanitizers"
-
-# Add azure-iot-sdk-c to support building agl-service-cloudproxy
-# and other users of Azure sdk.
-TOOLCHAIN_TARGET_TASK += "azure-iot-sdk-c umock-c"
-
-# Add mbedTLS to support building aws-iot-device-sdk-embedded-c
-TOOLCHAIN_TARGET_TASK += "mbedtls"
-
-# Add aws-iot-device-embedded-c sdk to support building agl-service-cloudproxy
-# and other users of AWS sdk.
-# These packages are required to add static library and headers:
-TOOLCHAIN_TARGET_TASK += "aws-iot-device-sdk-embedded-c-staticdev"
-TOOLCHAIN_TARGET_TASK += "aws-iot-device-sdk-embedded-c-dev"
-
-TOOLCHAIN_TARGET_TASK += "waltham-dev"
-
-
-# Required dependencies for app and test builds
-TOOLCHAIN_HOST_TASK += " \
-    nativesdk-lua \
-    "
-
-# Required dependencies for app and test builds
-TOOLCHAIN_TARGET_TASK += " \
-    lua-dev \
-    lua-staticdev \
-    libafb-helpers-staticdev \
-    libappcontroller-staticdev \
-    "
\ No newline at end of file
diff --git a/recipes-platform/images/agl-demo-platform-qa.bb b/recipes-platform/images/agl-demo-platform-qa.bb
deleted file mode 100644
index 05598ca79..000000000
--- a/recipes-platform/images/agl-demo-platform-qa.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "A full set of AGL Distribution for testing as Quality Assurance"
-
-DESCRIPTION = "A full set of AGL Distribution. This image also has additional \
-packages (e.g. commandline tools) for Quality Assurance(QA)."
-
-LICENSE = "MIT"
-
-require agl-demo-platform.bb
-
-IMAGE_INSTALL:append = " \
-    packagegroup-ivi-common-test \
-    packagegroup-agl-demo-platform-qa \
-    "
diff --git a/recipes-platform/images/agl-demo-platform.bb b/recipes-platform/images/agl-demo-platform.bb
deleted file mode 100644
index 5643d4dad..000000000
--- a/recipes-platform/images/agl-demo-platform.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and \
-demos."
-
-require agl-demo-platform.inc
-
-LICENSE = "MIT"
-
-# The demo will not work on the pi3 due to the gfx memory
-# and the applications requiring FHD (SPEC-390)
-COMPATIBLE_MACHINE:raspberrypi3 = "(^$)"
-
-# Always include the test widgets
-IMAGE_FEATURES:append = " agl-test-wgt"
-
-# add packages for demo platform (include demo apps) here
-IMAGE_INSTALL:append = " \
-    packagegroup-agl-demo-platform \
-    distro-build-manifest \
-    "
-
diff --git a/recipes-platform/images/agl-demo-platform.inc b/recipes-platform/images/agl-demo-platform.inc
deleted file mode 100644
index e901409a3..000000000
--- a/recipes-platform/images/agl-demo-platform.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Base image
-require agl-image-ivi.inc
-
-# Pull in speech framework bits
-IMAGE_FEATURES += "agl-speech-framework"
-
-# Pull in Alexa voiceagent if configured
-IMAGE_FEATURES += "${@bb.utils.filter("AGL_FEATURES", "agl-voiceagent-alexa", d)}"
diff --git a/recipes-platform/images/agl-image-cluster-qt5.bb b/recipes-platform/images/agl-image-cluster-qt5.bb
deleted file mode 100644
index ec4c9876d..000000000
--- a/recipes-platform/images/agl-image-cluster-qt5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SUMMARY = "A basic Wayland based cluster image with Qt5 support"
-
-require agl-image-cluster-qt5.inc
-
-LICENSE = "MIT"
-
-IMAGE_INSTALL:append = "\
-    profile-cluster-qt5 \
-    "
diff --git a/recipes-platform/images/agl-image-cluster-qt5.inc b/recipes-platform/images/agl-image-cluster-qt5.inc
deleted file mode 100644
index 93826aa46..000000000
--- a/recipes-platform/images/agl-image-cluster-qt5.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-require recipes-platform/images/agl-image-boot.inc
-
-IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
-
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland"
diff --git a/recipes-platform/images/agl-image-cluster.bb b/recipes-platform/images/agl-image-cluster.bb
deleted file mode 100644
index c4e33e332..000000000
--- a/recipes-platform/images/agl-image-cluster.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SUMMARY = "A basic Wayland based cluster image"
-
-require agl-image-cluster.inc
-
-LICENSE = "MIT"
-
-IMAGE_INSTALL:append = "\
-    profile-cluster \
-    "
diff --git a/recipes-platform/images/agl-image-cluster.inc b/recipes-platform/images/agl-image-cluster.inc
deleted file mode 100644
index 93826aa46..000000000
--- a/recipes-platform/images/agl-image-cluster.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-require recipes-platform/images/agl-image-boot.inc
-
-IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
-
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland"
diff --git a/recipes-platform/images/agl-image-graphical-html5.bb b/recipes-platform/images/agl-image-graphical-html5.bb
index 4ca67634a..c25a92750 100644
--- a/recipes-platform/images/agl-image-graphical-html5.bb
+++ b/recipes-platform/images/agl-image-graphical-html5.bb
@@ -1,6 +1,15 @@
 SUMMARY = "An image containing all packages required to run web applications"
 
-require agl-image-graphical-html5.inc
+require recipes-platform/images/agl-image-minimal.inc
+
+IMAGE_FEATURES += "splash"
+
+IMAGE_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'ssh-server-dropbear' , '', d)}"
+
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
 
 LICENSE = "MIT"
 
diff --git a/recipes-platform/images/agl-image-graphical-html5.inc b/recipes-platform/images/agl-image-graphical-html5.inc
deleted file mode 100644
index e943b9903..000000000
--- a/recipes-platform/images/agl-image-graphical-html5.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-require recipes-platform/images/agl-image-minimal.inc
-
-IMAGE_FEATURES += "splash"
-
-IMAGE_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'ssh-server-dropbear' , '', d)}"
-
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland"
diff --git a/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb b/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb
index 5147ea44a..596ac80eb 100755
--- a/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb
+++ b/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb
@@ -4,11 +4,25 @@ DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \
 It includes the full meta-toolchain, plus developement headers and libraries \
 to form a standalone cross SDK."
 
-require agl-image-graphical-qt5.bb
+#require agl-image-graphical-qt5.bb
+require recipes-platform/images/agl-image-weston.inc
+
 
 LICENSE = "MIT"
 
-require agl-image-graphical-qt5-crosssdk.inc
+require recipes-platform/images/agl-image-minimal-crosssdk.inc
+
+# Add wayland-scanner to SDK (SPEC-945)
+# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup
+# wayland-scanner is in nativesdk-wayland-dev !
+# option: add also nativesdk-qtwayland-tools
+TOOLCHAIN_HOST_TASK:append = " nativesdk-wayland nativesdk-wayland-dev"
+
+TOOLCHAIN_HOST_TASK:append = " nativesdk-perl-modules "
+
+# Add qtwaylandscanner to the SDK
+TOOLCHAIN_HOST_TASK:append = " nativesdk-qtwayland-tools "
+
 
 inherit populate_sdk populate_sdk_qt5
 
diff --git a/recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc b/recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc
deleted file mode 100644
index 760cbac05..000000000
--- a/recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-require recipes-platform/images/agl-image-minimal-crosssdk.inc
-
-TOOLCHAIN_TARGET_TASK += "libafb-helpers-qt-staticdev"
-
-# Add wayland-scanner to SDK (SPEC-945)
-# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup
-# wayland-scanner is in nativesdk-wayland-dev !
-# option: add also nativesdk-qtwayland-tools
-TOOLCHAIN_HOST_TASK:append = " nativesdk-wayland nativesdk-wayland-dev"
-
-TOOLCHAIN_HOST_TASK:append = " nativesdk-perl-modules "
-
-# Add qtwaylandscanner to the SDK
-TOOLCHAIN_HOST_TASK:append = " nativesdk-qtwayland-tools "
diff --git a/recipes-platform/images/agl-image-graphical-qt5.bb b/recipes-platform/images/agl-image-graphical-qt5.bb
deleted file mode 100644
index bcfd724fa..000000000
--- a/recipes-platform/images/agl-image-graphical-qt5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "A very basic Wayland image with a terminal"
-
-require agl-image-graphical-qt5.inc
-
-LICENSE = "MIT"
diff --git a/recipes-platform/images/agl-image-graphical-qt5.inc b/recipes-platform/images/agl-image-graphical-qt5.inc
deleted file mode 100644
index 114d06a07..000000000
--- a/recipes-platform/images/agl-image-graphical-qt5.inc
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-platform/images/agl-image-weston.inc
diff --git a/recipes-platform/images/agl-image-ivi-crosssdk.bb b/recipes-platform/images/agl-image-ivi-crosssdk.bb
index 72bf8f7b0..9636b609e 100644
--- a/recipes-platform/images/agl-image-ivi-crosssdk.bb
+++ b/recipes-platform/images/agl-image-ivi-crosssdk.bb
@@ -1,5 +1,16 @@
 require recipes-platform/images/agl-image-minimal-crosssdk.inc
-require agl-image-ivi.inc
+
+require recipes-platform/images/agl-image-minimal.inc
+
+IMAGE_INSTALL:append = "\
+    packagegroup-agl-image-ivi \
+    packagegroup-agl-ivi-services \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'packagegroup-pipewire', '', d)} \
+    can-utils \
+    iproute2 \
+    "
+
+IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
 
 inherit populate_sdk
 
diff --git a/recipes-platform/images/agl-image-ivi-qa.bb b/recipes-platform/images/agl-image-ivi-qa.bb
deleted file mode 100644
index 2a1dd1a09..000000000
--- a/recipes-platform/images/agl-image-ivi-qa.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "A basic system of AGL distribution of IVI profile for Quality Assurance(QA)"
-
-DESCRIPTION = "A basic set of AGL Distribution. This image also has additional \
-packages (e.g. commandline tools) for Quality Assurance(QA)."
-
-require agl-image-ivi.bb
-
-LICENSE = "MIT"
-
-IMAGE_INSTALL:append = " \
-    packagegroup-agl-test \
-    packagegroup-ivi-common-test \
-    "
-
diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-image-ivi.bb
index b3c72de0c..198d3fe33 100644
--- a/recipes-platform/images/agl-image-ivi.bb
+++ b/recipes-platform/images/agl-image-ivi.bb
@@ -2,7 +2,18 @@ SUMMARY = "A basic system of AGL distribution of IVI profile"
 
 DESCRIPTION = "Basic image for baseline of AGL Distribution for IVI profile."
 
-require agl-image-ivi.inc
+require recipes-platform/images/agl-image-minimal.inc
+
+IMAGE_INSTALL:append = "\
+    packagegroup-agl-image-ivi \
+    packagegroup-agl-ivi-services \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'packagegroup-pipewire', '', d)} \
+    can-utils \
+    iproute2 \
+    "
+
+IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
+
 
 LICENSE = "MIT"
 
diff --git a/recipes-platform/images/agl-image-ivi.inc b/recipes-platform/images/agl-image-ivi.inc
deleted file mode 100644
index 0f6b1e553..000000000
--- a/recipes-platform/images/agl-image-ivi.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-require recipes-platform/images/agl-image-minimal.inc
-
-IMAGE_INSTALL:append = "\
-    packagegroup-agl-image-ivi \
-    packagegroup-agl-ivi-services \
-    agl-service-homescreen \
-    agl-service-weather \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'packagegroup-pipewire', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-mediaplayer', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-radio', '', d)} \
-    can-utils \
-    iproute2 \
-    "
-
-IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
diff --git a/recipes-platform/images/agl-image-telematics.bb b/recipes-platform/images/agl-image-telematics.bb
deleted file mode 100644
index 94dd60986..000000000
--- a/recipes-platform/images/agl-image-telematics.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SUMMARY = "A basic telematics image"
-
-require agl-image-telematics.inc
-
-LICENSE = "MIT"
-
-IMAGE_INSTALL:append = "\
-    profile-telematics \
-    "
diff --git a/recipes-platform/images/agl-image-telematics.inc b/recipes-platform/images/agl-image-telematics.inc
deleted file mode 100644
index 3e951550e..000000000
--- a/recipes-platform/images/agl-image-telematics.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-require recipes-platform/images/agl-image-boot.inc
-
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "3g"
diff --git a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb b/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
new file mode 100644
index 000000000..490047635
--- /dev/null
+++ b/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
@@ -0,0 +1,59 @@
+SUMMARY = "Cross SDK of Full AGL Distribution for IVI profile"
+
+DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \
+It includes the full meta-toolchain, plus developement headers and libraries \
+to form a standalone cross SDK."
+
+
+# add packages for demo platform (include demo apps) here
+IMAGE_INSTALL:append = " \
+    packagegroup-agl-demo-platform \
+    "
+
+LICENSE = "MIT"
+
+#require agl-image-graphical-qt5-crosssdk.inc
+require recipes-platform/images/agl-image-weston.inc
+require recipes-platform/images/agl-image-minimal-crosssdk.inc
+
+# Add wayland-scanner to SDK (SPEC-945)
+# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup
+# wayland-scanner is in nativesdk-wayland-dev !
+# option: add also nativesdk-qtwayland-tools
+TOOLCHAIN_HOST_TASK:append = " nativesdk-wayland nativesdk-wayland-dev"
+
+TOOLCHAIN_HOST_TASK:append = " nativesdk-perl-modules "
+
+# Add qtwaylandscanner to the SDK
+TOOLCHAIN_HOST_TASK:append = " nativesdk-qtwayland-tools "
+
+
+# Task do_populate_sdk and do_rootfs can't be exec simultaneously.
+# Both exec "createrepo" on the same directory, and so one of them
+# can failed (randomly).
+addtask do_populate_sdk after do_rootfs
+
+inherit populate_sdk populate_sdk_qt5
+
+# Task do_populate_sdk and do_rootfs can't be exec simultaneously.
+# Both exec "createrepo" on the same directory, and so one of them
+# can failed (randomly).
+addtask do_populate_sdk after do_rootfs
+
+# Add gcc-sanitizers to support building applications using the SDK with
+# AddressSanitizer support to detect use-after-frees along with other
+# memory issue.
+TOOLCHAIN_TARGET_TASK += "gcc-sanitizers"
+
+TOOLCHAIN_TARGET_TASK += "waltham-dev"
+
+
+TOOLCHAIN_HOST_TASK += " \
+    nativesdk-lua \
+    "
+
+# Required dependencies for app and test builds
+TOOLCHAIN_TARGET_TASK += " \
+    lua-dev \
+    lua-staticdev \
+    "
\ No newline at end of file
diff --git a/recipes-platform/images/agl-demo-platform-html5.bb b/recipes-platform/images/agl-ivi-demo-platform-html5.bb
index a78b8b68b..bef66eb32 100644
--- a/recipes-platform/images/agl-demo-platform-html5.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform-html5.bb
@@ -1,7 +1,7 @@
 SUMMARY = "DEMO platform of AGL HTML5 profile"
 DESCRIPTION = "Contains the web runtime and sample web apps"
 
-require agl-demo-platform.inc
+require agl-image-ivi.bb
 
 LICENSE = "MIT"
 
diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-platform.bb
new file mode 100644
index 000000000..78a6b2c24
--- /dev/null
+++ b/recipes-platform/images/agl-ivi-demo-platform.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and \
+demos."
+
+require agl-image-ivi.bb
+
+
+LICENSE = "MIT"
+
+# add packages for demo platform (include demo apps) here
+IMAGE_INSTALL:append = " \
+    packagegroup-agl-demo-platform \
+    "
+
diff --git a/recipes-platform/images/agl-telematics-demo-platform-crosssdk.bb b/recipes-platform/images/agl-telematics-demo-platform-crosssdk.bb
deleted file mode 100644
index a3efec425..000000000
--- a/recipes-platform/images/agl-telematics-demo-platform-crosssdk.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "Cross SDK of AGL Distribution for telematics profile Demo"
-
-DESCRIPTION = "SDK image for AGL Distribution for Telematics profile Demo. \
-It includes the full meta-toolchain, plus developement headers and libraries \
-to form a standalone cross SDK."
-
-require agl-telematics-demo-platform.bb
-
-LICENSE = "MIT"
-
-IMAGE_FEATURES:append = " dev-pkgs"
-IMAGE_INSTALL:append = " kernel-dev kernel-devsrc"
-
-inherit populate_sdk
-
-# Task do_populate_sdk and do_rootfs can't be exec simultaneously.
-# Both exec "createrepo" on the same directory, and so one of them
-# can failed (randomly).
-addtask do_populate_sdk after do_rootfs
-
-TOOLCHAIN_HOST_TASK:append = " nativesdk-perl-modules "
diff --git a/recipes-platform/images/agl-telematics-demo-platform.bb b/recipes-platform/images/agl-telematics-demo-platform.bb
deleted file mode 100644
index 41ae11b33..000000000
--- a/recipes-platform/images/agl-telematics-demo-platform.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "AGL Telematics Demo Platform image."
-
-require agl-telematics-demo-platform.inc
-
-LICENSE = "MIT"
-
-IMAGE_FEATURES:append = " \
-    "
-
-IMAGE_INSTALL:append = " \
-    packagegroup-agl-telematics-demo-platform \
-    "
-
diff --git a/recipes-platform/images/agl-telematics-demo-platform.inc b/recipes-platform/images/agl-telematics-demo-platform.inc
deleted file mode 100644
index bd3a89ee1..000000000
--- a/recipes-platform/images/agl-telematics-demo-platform.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Base image
-require recipes-platform/images/agl-image-telematics.inc
-
diff --git a/recipes-platform/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/recipes-platform/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
deleted file mode 100644
index 9476fac5e..000000000
--- a/recipes-platform/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-RDEPENDS:${PN} =+ "nativesdk-af-main-tools nativesdk-af-binder-devtools"
-RDEPENDS:${PN} += "nativesdk-low-level-can-generator \
-		nativesdk-cmake-apps-module \
-		nativesdk-cmake-apps-module-doc \
-"
-
diff --git a/recipes-platform/packagegroups/packagegroup-agl-app-framework.bbappend b/recipes-platform/packagegroups/packagegroup-agl-app-framework.bbappend
deleted file mode 100644
index bb9f0f9d7..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-app-framework.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS:${PN}:append = " systemd-agl-sync run-agl-postinsts"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-appfw-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-appfw-html5.bb
deleted file mode 100644
index 6fed7e7d8..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-appfw-html5.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "AGL web runtime packages"
-DESCRIPTION = "Specific packages for the AGL web runtime (minus profile-graphical)"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-appfw-html5 \
-    "
-
-ALLOW_EMPTY:${PN} = "1"
-
-# add packages for WAM
-RDEPENDS:${PN} += " \
-    chromium-browser-service \
-    wam \
-    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb b/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb
deleted file mode 100644
index 151245d5d..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "Qt5 for native GUI framework of AGL IVI profile"
-DESCRIPTION = "A set of Qt5 packages which required by Native App Fw Subsystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-appfw-native-qt5 \
-    "
-
-#ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
-    qtbase \
-    qtbase-dev \
-    qtbase-plugins \
-    qtbase-staticdev \
-    qtbase-tools \
-    qtdeclarative \
-    qtdeclarative-qmlplugins \
-    qtdeclarative-tools \
-    qtcharts \
-    qtwayland \
-    qtwayland-plugins \
-    qtwayland-tools \
-    qtgraphicaleffects-qmlplugins \
-    qtvirtualkeyboard \
-    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
deleted file mode 100644
index 681a04370..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "The software for demo platform of AGL cluster profile"
-DESCRIPTION = "A set of packages belong to AGL Cluster Demo Platform"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-cluster-demo-platform \
-    "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
-    packagegroup-agl-profile-cluster-qt5 \
-    packagegroup-agl-ttf-fonts \
-    packagegroup-agl-source-han-sans-ttf-fonts \
-    packagegroup-agl-networking \
-    "
-
-
-AGL_APPS = " \
-    cluster-dashboard \
-    cluster-receiver \
-    qt-cluster-receiver \
-    "
-
-AGL_APIS = " \
-    agl-service-can-low-level \
-    agl-service-gps \
-    agl-service-signal-composer \
-    "
-
-RDEPENDS:${PN}:append = " \
-    hmi-debug \
-    can-utils \
-    linux-firmware-ralink \
-    ${AGL_APPS} \
-    ${AGL_APIS} \
-"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb
deleted file mode 100644
index 6a1455e99..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SUMMARY = "The software for AGL Cluster Demo Qtwayland Compositor"
-DESCRIPTION = "A set of packages belong to AGL Cluster Demo Qtwayland Compositor"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-cluster-demo-qtcompositor \
-    "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
-    packagegroup-agl-profile-cluster-qtcompositor \
-    packagegroup-agl-ttf-fonts \
-    packagegroup-agl-networking \
-    "
-
-AGL_SERVICE = " \
-    agl-service-bluetooth \
-    agl-service-can-low-level \
-    agl-service-data-persistence \
-    agl-service-gps \
-    agl-service-network \
-    agl-service-unicens \
-    agl-service-hvac \
-    agl-service-nfc \
-    agl-service-identity-agent \
-    "
-
-AGL_APPS = " \
-    cluster-gauges-qtcompositor \
-    "
-
-RDEPENDS:${PN}:append = " \
-    libva-utils \
-    linux-firmware-ralink \
-    can-utils \
-    most \
-    ${AGL_SERVICE} \
-    ${AGL_APPS} \
-"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-core-devel.bbappend b/recipes-platform/packagegroups/packagegroup-agl-core-devel.bbappend
deleted file mode 100644
index 37414a170..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-core-devel.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-RDEPENDS:${PN}:append = "\
-        pyagl \
-        gcov \
-        gcov-symlinks \
-        gcovr \
-        gcovr-wrapper \
-        jq \
-        htop \
-        tree \
-"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
deleted file mode 100644
index ac82d73c7..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "The software for DEMO platform of AGL HTML5 profile"
-DESCRIPTION = "Packages required to demo the HTML5 profile and sample web apps"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-demo-platform-html5 \
-    "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
-    packagegroup-agl-image-ivi \
-    packagegroup-agl-profile-graphical-html5 \
-    packagegroup-agl-demo \
-    "
-
-AGL_APPS = " \
-    html5-homescreen \
-    html5-launcher \
-    html5-hvac \
-    html5-settings \
-    html5-mixer \
-    html5-mediaplayer \
-    html5-dashboard \
-    html5-background \
-    "
-
-RDEPENDS:${PN}:append = " \
-    weston-ini-conf-landscape \
-    ${AGL_APPS} \
-    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-qa.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-qa.bb
deleted file mode 100644
index ca4cf1571..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-qa.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "The software for DEMO platform of AGL IVI profile"
-DESCRIPTION = "A set of packages belong to AGL Demo Platform includes utilities for testing distribution as Quality Assurance"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-demo-platform-qa \
-    "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
-    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index 6fec1fc5c..baffeb296 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -23,38 +23,6 @@ RDEPENDS:${PN} += "\
     packagegroup-agl-demo \
     "
 
-AGL_APPS = " \
-    dashboard \
-    hvac \
-    mediaplayer \
-    virtual/navigation \
-    phone \
-    poiapp \
-    radio \
-    settings \
-    messaging \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'taskmanager' , '', d)} \
-    ${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin' , '', d)} \
-    virtual/mixer \
-    virtual/qtwayland-config \
-    "
-
-QTAGLEXTRAS = " libqtappfw"
-
-# add support for websocket in Qt and QML
-QTAGLEXTRAS:append = " qtwebsockets qtwebsockets-qmlplugins"
-#PREFERRED_PROVIDER_virtual/webruntime = "web-runtime"
-
-# Cluster demo support.
-# ATM no cluster map viewer is supported with the older navigation application.
-MAPVIEWER = "${@bb.utils.contains("PREFERRED_RPROVIDER_virtual/navigation", "ondemandnavi", "tbtnavi", "",d)}"
-CLUSTER_SUPPORT_PACKAGES = " \
-	${MAPVIEWER} \
-	cluster-demo-network-config \
-	cluster-lin-bridging-config \
-	cluster-demo-simulator \
-"
-CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-cluster-demo-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}"
 
 DEMO_UNIT_CONF ?= ""
 # Hook for demo platform configuration
@@ -71,9 +39,6 @@ RDEPENDS:${PN}:append = " \
     qtquickcontrols2-agl \
     qtquickcontrols2-agl-style \
     ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \
-    ${AGL_APPS} \
-    ${QTAGLEXTRAS} \
-    ${CLUSTER_SUPPORT} \
     ${DEMO_PRELOAD} \
     "
 
@@ -84,15 +49,4 @@ RDEPENDS:${PN}:append = " \
 #       names from the virtual/ RPROVIDES at present.
 RDEPENDS:${PN}-devel = " \
     packagegroup-hmi-framework-devel \
-    dashboard-dbg \
-    hvac-dbg \
-    mediaplayer-dbg \
-    mixer-dbg \
-    phone-dbg \
-    ondemandnavi-dbg \
-    poiapp-dbg \
-    radio-dbg \
-    settings-dbg \
-    messaging-dbg \
-    taskmanager-dbg \
     "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-qt-examples.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-qt-examples.bb
deleted file mode 100644
index f928d6527..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-qt-examples.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "The examples to test Qt5 on AGL Demo Platform"
-DESCRIPTION = "A set of packages which contains Qt5 examples"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-demo-qt-examples \
-    "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
-    qt3d-examples \
-    qtbase-examples \
-    qtconnectivity-examples \
-    qtdeclarative-examples \
-    qtlocation-examples \
-    qtmultimedia-examples \
-    qtsensors-examples \
-    qtsystems-examples \
-    qttools-examples \
-    qtwayland-examples \
-    qtxmlpatterns-examples \
-    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 48b605dbd..b0db220fc 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -11,30 +11,6 @@ PACKAGES = "\
 
 ALLOW_EMPTY:${PN} = "1"
 
-# MOST out-of-tree kernel drivers
-#################################
-MOST_DRIVERS ??= " \
-    most \
-    "
-# These boards use different kernels - needs to be checked
-MOST_DRIVERS_dragonboard-410c ?= ""
-MOST_DRIVERS_cyclone5 ?= ""
-
-
-# HVAC dependencies
-###################
-LIN_DRIVERS ??= " sllin"
-# These boards use different kernels - needs to be checked
-LIN_DRIVERS_dra7xx-evm ?= ""
-LIN_DRIVERS_dragonboard-410c ?= ""
-
-# UNICENS service
-UNICENS ?= " \
-    unicens-config \
-    agl-service-unicens \
-    agl-service-unicens-controller \
-    "
-
 # Hook for demo platform configuration
 # ATM, only used to disable btwilink module on [MH]3ULCB + Kingfisher by default,
 # setting DEMO_ENABLE_BTWILINK to "true" in local.conf / site.conf re-enables.
@@ -66,9 +42,6 @@ RDEPENDS:${PN} += " \
     can-utils \
     cannelloni \
     iproute2 \
-    ${UNICENS} \
-    ${MOST_DRIVERS} \
-    ${LIN_DRIVERS} \
     ${DEMO_PLATFORM_CONF} \
     ${TTF_FONTS} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb b/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb
deleted file mode 100644
index 9152dc4ac..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "The minimal set of packages for Connectivity Subsystem"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-graphical-services \
-    "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-mediaplayer', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-radio', '', d)} \
-    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
index 83b5c3497..c2250c6f2 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
+++ b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
@@ -1,7 +1,3 @@
 RDEPENDS:${PN} += " \
                   agl-compositor \
                   "
-# appfw 
-RDEPENDS:${PN} += " \
-                  agl-login-manager \
-                  "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
index 1f912be22..ea165effb 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
@@ -21,6 +21,3 @@ RDEPENDS:${PN} += "\
     packagegroup-agl-ivi-navigation \
     "
 
-RDEPENDS:${PN} += "\
-    agl-login-manager \
-    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bbappend b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bbappend
index dcff983b2..0551c4e91 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bbappend
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bbappend
@@ -1,5 +1,4 @@
 
 RDEPENDS:${PN} += "\
-    agl-service-nfc \
 "
 
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb
index b5549a0dc..c81aa8072 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb
@@ -1,8 +1,6 @@
 inherit packagegroup
 
 RDEPENDS:${PN} += "\
-    agl-service-data-persistence \
-    agl-service-identity-agent \
 "
 
 LICENSE = "MIT"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
index 39e77fabd..213b47576 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
@@ -8,26 +8,4 @@ PACKAGES = "\
     "
 
 RDEPENDS:${PN} += "\
-    agl-service-bluetooth \
-    agl-service-bluetooth-map \
-    agl-service-bluetooth-pbap \
-    agl-service-can-low-level \
-    agl-service-geoclue \
-    agl-service-geofence \
-    agl-service-gps \
-    agl-service-hvac \
-    agl-service-identity-agent \
-    agl-service-iiodevices \
-    agl-service-mediascanner \
-    agl-service-navigation \
-    agl-service-nfc \
-    agl-service-signal-composer \
-    agl-service-telephony \
-    agl-service-unicens \
-    agl-service-unicens-controller \
-    agl-service-weather \
-    ${@bb.utils.contains('AGL_CLOUDPROXY_WANTED','1', 'agl-service-cloudproxy libcloudproxy', '', d)} \
-    agl-service-data-persistence \
-    agl-service-network \
-    agl-service-platform-info \
     "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb
index c004f48aa..ae1ad96be 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb
@@ -30,7 +30,6 @@ QT_LITE = " \
 
 RDEPENDS:${PN}:append = " \
     ${QT_LITE} \
-    agl-login-manager \
 "
 
 RDEPENDS:profile-cluster-qt5 = "${PN}"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb
index c25401a24..d39291614 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb
@@ -17,7 +17,6 @@ RDEPENDS:${PN} += "\
 "
 
 RDEPENDS:${PN} += "\
-    agl-login-manager \
     "
 
 RDEPENDS:profile-graphical-html5 = "${PN}"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb
index fc30d6a45..9f4e7f4f5 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb
@@ -13,11 +13,9 @@ ALLOW_EMPTY:${PN} = "1"
 
 RDEPENDS:${PN} += "\
     packagegroup-agl-profile-graphical \
-    packagegroup-agl-appfw-native-qt5 \
 "
 
 RDEPENDS:${PN} += "\
-    agl-login-manager \
     "
 
 RDEPENDS:profile-graphical-qt5 = "${PN}"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bbappend b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bbappend
deleted file mode 100644
index 56afcfa41..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-RDEPENDS:${PN} += "\
-    packagegroup-agl-graphical-services \
-"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb
index 32702d74a..4377dbbc8 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb
@@ -16,9 +16,6 @@ RDEPENDS:${PN} += "\
     packagegroup-agl-core-security \
     ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client','',d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "3g", "libqmi", "", d)} \
-    agl-login-manager \
-    agl-service-can-low-level \
-    agl-service-network \
     can-utils \
 "
 
diff --git a/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb b/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb
index 18691c2a0..ceffd093b 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb
@@ -8,6 +8,4 @@ PACKAGES = "\
     "
 
 RDEPENDS:${PN} += "\
-    agl-service-voice-high \
-    agl-service-voice-high-capabilities \
 "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb
index 548337d45..17b5c8b24 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb
@@ -16,11 +16,9 @@ RDEPENDS:${PN} += "\
     "
 
 AGL_APPS = " \
-    telematics-recorder \
     "
 
 AGL_APIS = " \
-    agl-service-gps \
     "
 
 RDEPENDS:${PN}:append = " \
diff --git a/recipes-platform/packagegroups/packagegroup-hmi-framework.bb b/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
index d4f32d483..5036ee39a 100644
--- a/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
+++ b/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
@@ -16,21 +16,13 @@ PACKAGES = "\
     "
 
 RDEPENDS:${PN} = " \
-  agl-service-homescreen \
   homescreen \
-  libhomescreen \
-  qlibhomescreen \
-  hmi-debug \
-  launcher \
-"
+  "
+  
+#  hmi-debug \
+#  launcher \
+#"
 
 # temporarily disable due to failure to install package when AGLCI is on
 #RDEPENDS:append_${PN} = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'homescreen-demo-ci', '', d)}"
 
-# NOTE: Currently no coverage versions of these widgets, they should
-#       be added here when available.
-RDEPENDS:${PN}-devel = " \
-  agl-service-homescreen-dbg \
-  homescreen-dbg \
-  launcher-dbg \
-"
diff --git a/recipes-support/curl/curl_%.bbappend b/recipes-support/curl/curl_%.bbappend
deleted file mode 100644
index b126b6d20..000000000
--- a/recipes-support/curl/curl_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'curl_agldemo.inc', '', d)}
diff --git a/recipes-support/curl/curl_agldemo.inc b/recipes-support/curl/curl_agldemo.inc
deleted file mode 100644
index fc24cea15..000000000
--- a/recipes-support/curl/curl_agldemo.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Cannot just append to PACKAGECONFIG, as nghttp2's dependencies do not build
-# for native/nativesdk, and appending class-target does not work because of
-# the weak definition of PACKAGECONFIG in the recipe, so need to copy the
-# definition to add nghttp2...
-PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls libidn proxy threaded-resolver verbose zlib nghttp2"
diff --git a/scripts/run-yocto-check-layer-all-layers.sh b/scripts/run-yocto-check-layer-all-layers.sh
index 20ded0e93..2d96eda51 100755
--- a/scripts/run-yocto-check-layer-all-layers.sh
+++ b/scripts/run-yocto-check-layer-all-layers.sh
@@ -52,10 +52,8 @@ yocto-check-layer -d \
 	$AGLROOT/external/meta-openembedded/meta-perl \
 	$AGLROOT/meta-agl/meta-agl-core \
 	$AGLROOT/external/meta-qt5 \
-	$AGLROOT/meta-agl/meta-app-framework \
 	--additional-layers \
 	$AGLROOT/external/meta-qt5 \
-	$AGLROOT/meta-agl/meta-app-framework \
 	$AGLROOT/external/meta-python2 \
 	-- \
 	$AGLROOT/meta-agl-demo
diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
index 5562e5e03..7dfba9085 100644
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -5,11 +5,13 @@ BBLAYERS =+ " \
 "
 
 AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
 
 # OpenEmbedded layer to add support for multiple cloud service provider solutions
 #---------------------------------------------------
 BBLAYERS =+ " \
-   ${METADIR}/external/meta-iot-cloud \
    ${METADIR}/external/meta-qt5 \
-   ${METADIR}/external/meta-python2 \
 "
+
+#   ${METADIR}/external/meta-python2 \
+#
\ No newline at end of file
diff --git a/templates/feature/agl-demo/50_local.conf.inc b/templates/feature/agl-demo/50_local.conf.inc
index 3b866e6f0..76626243c 100644
--- a/templates/feature/agl-demo/50_local.conf.inc
+++ b/templates/feature/agl-demo/50_local.conf.inc
@@ -1,6 +1,2 @@
 #see meta-agl-demo/conf/include/agl-demo.inc
 require conf/include/agl-demo.inc
-
-#see meta-agl-demo/conf/include/agl-cloudproxy.inc
-#SPEC-3826
-require conf/include/agl-cloudproxy.inc
diff --git a/templates/feature/agl-demo/README_feature_agl-demo.md b/templates/feature/agl-demo/README_feature_agl-demo.md
index 76b587edb..31883cd69 100644
--- a/templates/feature/agl-demo/README_feature_agl-demo.md
+++ b/templates/feature/agl-demo/README_feature_agl-demo.md
@@ -11,8 +11,6 @@ authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly
 
 The following features are pulled:
 
-* agl-appfw-smack
-* agl-hmi-framework
 * agl-profile-graphical-qt5
 * agl-pipewire
 
diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep
index 14507678f..d0b204176 100644
--- a/templates/feature/agl-demo/included.dep
+++ b/templates/feature/agl-demo/included.dep
@@ -1 +1 @@
-agl-appfw-smack agl-hmi-framework agl-pipewire
+agl-pipewire