diff --git a/board/czechlight/clearfog/CL-ROADMv2-clearfog.dts b/board/czechlight/clearfog/CL-ROADMv2-clearfog.dts
deleted file mode 100644
index 592b666..0000000
--- a/board/czechlight/clearfog/CL-ROADMv2-clearfog.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "armada-388-clearfog-base.dts"
-
-&w25q32 {
-	status = "okay";
-};
-
-/ {
-	soc {
-		internal-regs {
-			sdhci@d8000 {
-				/delete-property/ cd-gpios;
-				broken-cd;
-			};
-		};
-	};
-};
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-CL-ROADMv2.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-CL-ROADMv2.service
deleted file mode 100644
index 51cedeb..0000000
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-CL-ROADMv2.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=CzechLight CL-ROADMv2 driver
-After=syslog.target network.target sysrepod.service
-Before=rauc-mark-good.service
-Requires=sysrepod.service
-PartOf=sysrepod.service
-StartLimitIntervalSec=0
-ConditionKernelCommandLine=czechlight=CL-ROADMv2
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/cla-sysrepod --properties-log-level=5 --sr-bridge-log-level=5 --sysrepo-log-level=3 --appliance=CL-ROADMv2
-PrivateTmp=yes
-PrivateDevices=no
-ProtectSystem=yes
-ProtectHome=yes
-Restart=on-abnormal
-SystemCallArchitectures=native
-Restart=always
-WatchdogSec=15s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-STATIC-CL-ROADMv2.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-STATIC-CL-ROADMv2.service
deleted file mode 100644
index 40174cb..0000000
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-STATIC-CL-ROADMv2.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=CzechLight dummy static data for the CL-ROADMv2
-After=syslog.target network.target sysrepod.service
-Before=rauc-mark-good.service
-Requires=sysrepod.service
-PartOf=sysrepod.service
-StartLimitIntervalSec=0
-ConditionKernelCommandLine=czechlight=STATIC-CL-ROADMv2
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/cla-sysrepod --properties-log-level=5 --sr-bridge-log-level=5 --sysrepo-log-level=3 --module=czechlight-roadm-v2 --toplevel=roadm --static-properties=/usr/share/cla-sysrepo/static-data/czechlight-roadm-v2.static.data
-PrivateTmp=yes
-PrivateDevices=no
-ProtectSystem=yes
-ProtectHome=yes
-Restart=on-abnormal
-SystemCallArchitectures=native
-Restart=always
-WatchdogSec=15s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-i2c-adt7463.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-i2c-adt7463.service
index 89b2d81..7c5f7fe 100644
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-i2c-adt7463.service
+++ b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-i2c-adt7463.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Configure the I2C ADT7463 for two-wire fans
-ConditionKernelCommandLine=|czechlight=CL-ROADMv2
 ConditionKernelCommandLine=|czechlight=sdn-roadm-add-drop
 ConditionKernelCommandLine=|czechlight=sdn-roadm-line
 ConditionKernelCommandLine=|czechlight=sdn-roadm-coherent-a-d
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-install-yang-CL-ROADMv2.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-install-yang-CL-ROADMv2.service
deleted file mode 100644
index 58ec49c..0000000
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-install-yang-CL-ROADMv2.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Install YANG and initial data for the CL-ROADMv2
-Requires=sysrepod.service
-ConditionKernelCommandLine=czechlight=CL-ROADMv2
-ConditionPathExistsGlob=!/etc/sysrepo/yang/czechlight-roadm-v2@*.yang
-Before=sysrepod.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sysrepoctl --install --search-dir /usr/share/cla-sysrepo/yang --yang /usr/share/cla-sysrepo/yang/czechlight-roadm-v2.yang
-ExecStart=/usr/bin/sysrepocfg --datastore=startup --import=/usr/share/cla-sysrepo/yang/czechlight-roadm-v2.startup.xml czechlight-roadm-v2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-install-yang-STATIC-CL-ROADMv2.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-install-yang-STATIC-CL-ROADMv2.service
deleted file mode 100644
index 4637eef..0000000
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-install-yang-STATIC-CL-ROADMv2.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Install YANG and initial data for the STATIC version of CL-ROADMv2
-Requires=sysrepod.service
-ConditionKernelCommandLine=czechlight=STATIC-CL-ROADMv2
-ConditionPathExistsGlob=!/etc/sysrepo/yang/czechlight-roadm-v2@*.yang
-Before=sysrepod.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sysrepoctl --install --search-dir /usr/share/cla-sysrepo/yang --yang /usr/share/cla-sysrepo/yang/czechlight-roadm-v2.yang
-ExecStart=/usr/bin/sysrepocfg --datastore=startup --import=/usr/share/cla-sysrepo/yang/czechlight-roadm-v2.startup.xml czechlight-roadm-v2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index f68fd78..d1d39a9 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -30,7 +30,7 @@
 BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/linux.fragment $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/czechlight-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/CL-ROADMv2-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-line-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-add-drop-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-coherent-a-d-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-inline-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-testing-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/bare-cfb-base-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/bare-cfb-pro-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/clearfog-output-voa.dtsi"
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/czechlight-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-line-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-add-drop-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-coherent-a-d-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-inline-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-testing-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/bare-cfb-base-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/bare-cfb-pro-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/clearfog-output-voa.dtsi"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_PACKAGE_LINUX_TOOLS_GPIO=y
 BR2_PACKAGE_LINUX_TOOLS_IIO=y