diff --git a/BM/README.md b/BM/README.md
index 6f1e2d4a..469c471a 100644
--- a/BM/README.md
+++ b/BM/README.md
@@ -13,7 +13,6 @@
   * [IFS(In Field Scan)](ifs/README.md)
   * [ISST](isst/README.md)
   * [PMU](pmu/README.md)
-  * [PREFETCHI(Code SW Prefetch)](prefetchi/README.md)
   * [pstate](pstate/README.md)
   * [Intel_PT](pt/README.md)
   * [RAPL](rapl/README.md)
diff --git a/BM/cmpccxadd/.vscode/settings.json b/BM/cmpccxadd/.vscode/settings.json
new file mode 100644
index 00000000..61168feb
--- /dev/null
+++ b/BM/cmpccxadd/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "limits.h": "c"
+    }
+}
\ No newline at end of file
diff --git a/BM/prefetchi/Makefile b/BM/prefetchi/Makefile
deleted file mode 100644
index 78a08187..00000000
--- a/BM/prefetchi/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (c) 2024 Intel Corporation.
-
-CC = gcc
-CFLAGS = -g -Wall 
-TARGET = prefetchi
-
-$(TARGET): prefetchi.c
-	$(CC) $(CFLAGS) -o $@ $<
-
-clean:
-	rm -f $(TARGET)
diff --git a/BM/prefetchi/README.md b/BM/prefetchi/README.md
deleted file mode 100644
index 4036f6bc..00000000
--- a/BM/prefetchi/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# PREFETCHI (Code SW Prefetch)
-
-## Description
-PREFETCHI is a new set of instructions in the latest Intel platform Granite Rapids. This new instruction set moves code to memory (cache) closer to the processor depending on specific hints. The encodings stay NOPs in processors that do not enumerate these instructions.
-
-This is a basic test to ensure PREFETCHIT0/1 is supported on your platform.
-
-## Usage
-```
-make
-./prefetchi
-```
-Test result will be printed out.
diff --git a/BM/prefetchi/prefetchi.c b/BM/prefetchi/prefetchi.c
deleted file mode 100644
index eff319d0..00000000
--- a/BM/prefetchi/prefetchi.c
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-// Copyright (c) 2024 Intel Corporation.
-
-#include <stdio.h>
-#include <stdint.h>
-#include "../common/kselftest.h"
-
-#define CPUID_LEAF7_EDX_PREFETCHI_MASK	(1 << 14) /* PREFETCHI instructions */
-
-static void check_cpuid_prefetchi(void)
-{
-	uint32_t eax, ebx, ecx, edx;
-
-	/*
-	 * CPUID.(EAX=07H, ECX=01H).EDX.PREFETCHI[bit 14] enumerates
-	 * support for PREFETCHIT0/1 instructions.
-	 */
-	__cpuid_count(7, 1, eax, ebx, ecx, edx);
-	if (!(edx & CPUID_LEAF7_EDX_PREFETCHI_MASK))
-		printf("cpuid: CPU doesn't support PREFETCHIT0/1.\n");
-	else
-		printf("Test passed\n");
-}
-
-int main(void)
-{
-	check_cpuid_prefetchi();
-	return 0;
-}
diff --git a/README.md b/README.md
index b2f24f35..69305302 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,6 @@ More details please refer to following.
   * [IFS(In Field Scan)](BM/ifs/README.md)
   * [ISST](BM/isst/README.md)
   * [PMU](BM/pmu/README.md)
-  * [PREFETCHI(Code SW Prefetch)](BM/prefetchi/README.md)
   * [pstate](BM/pstate/README.md)
   * [Intel_PT](BM/pt/README.md)
   * [RAPL](BM/rapl/README.md)