diff --git a/.dictionary b/.dictionary
index d2d242c87ee2bd686fdc72319b73fbcd2dd884fb..78de646308211df0414f9edf46cf13ee492f33dc 100644
--- a/.dictionary
+++ b/.dictionary
@@ -16,6 +16,7 @@ bsp
 buildable
 BUILDIN
 cassini
+cassini-sdk
 cgroups
 COMPAT
 config
@@ -29,6 +30,7 @@ crypto
 DHCP
 dialout
 distro
+DISTRO_FEATURE
 DISTROOVERRIDES
 efidisk
 eglibc
diff --git a/conf/machine/include/n1sdp-cassini-extra-settings.inc b/conf/machine/include/n1sdp-cassini-extra-settings.inc
deleted file mode 100644
index 4b286edc8a63c19166ace82bd78e6624a874ecc0..0000000000000000000000000000000000000000
--- a/conf/machine/include/n1sdp-cassini-extra-settings.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-FileCopyrightText: <text>Copyright 2022-2023 Arm Limited and/or its
-# affiliates <open-source-office@arm.com></text>
-#
-# SPDX-License-Identifier: MIT
-
-# FFA driver
-MACHINE_FEATURES:append = " arm-ffa"
-
-# Trusted services secure partitions
-MACHINE_FEATURES:append = " ts-crypto ts-storage ts-its ts-attestation ts-block-storage"
-
-IMAGE_INSTALL:append:cassini-test = " optee-test optee-xtests-ptest"
diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend
index 75f993cb53dafc791a569e40df9390505f7aaa0a..0a12842089e18849f023e479476caa71ee33f2df 100644
--- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend
+++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: <text>Copyright 2023-2024 Arm Limited and/or its
+# SPDX-FileCopyrightText: <text>Copyright 2023-2025 Arm Limited and/or its
 # affiliates <open-source-office@arm.com></text>
 #
 # SPDX-License-Identifier: MIT
@@ -10,7 +10,4 @@ SRC_URI:append:cassini:corstone1000 = " \
     file://cgroups.cfg \
     file://container.cfg \
     file://network.cfg \
-    ${@bb.utils.contains('DISTRO_FEATURES', \
-            'cassini-sdk', \
-            'file://sdk.cfg', '', d)} \
     "