diff --git a/bpf/headers/include/bpf/BpfUtils.h b/bpf/headers/include/bpf/BpfUtils.h
index 9bb5e5ac96..2cf1d06350 100644
--- a/bpf/headers/include/bpf/BpfUtils.h
+++ b/bpf/headers/include/bpf/BpfUtils.h
@@ -64,14 +64,12 @@ static inline int get_api_level_full() {
 
 const int api_level_full = get_api_level_full();
 
-const bool isAtLeastR    = (api_level_full >= 3000);  // 30
 const bool isAtLeastS    = (api_level_full >= 3100);  // 31
-const bool isAtLeastSv2  = (api_level_full >= 3200);  // 32
+                                                      // 32 is Sv2
 const bool isAtLeastT    = (api_level_full >= 3300);  // 33
 const bool isAtLeastU    = (api_level_full >= 3400);  // 34
 const bool isAtLeastV    = (api_level_full >= 3500);  // 35
 const bool isAtLeast25Q2 = (api_level_full >= 3600);  // 36.0
-const bool isAtLeast25Q3 = (api_level_full >= 3602);  // 36.0+
 const bool isAtLeast25Q4 = (api_level_full >= 3610);  // 36.1
 const bool isAtLeast26Q1 = (api_level_full >= 3612);  // 36.1+
 const bool isAtLeast26Q2 = (api_level_full >= 3700);  // 37.0
diff --git a/bpf/progs/include/bpf_map_def.h b/bpf/progs/include/bpf_map_def.h
index dc34aac9a5..39f5b00c3f 100644
--- a/bpf/progs/include/bpf_map_def.h
+++ b/bpf/progs/include/bpf_map_def.h
@@ -210,7 +210,6 @@ _Static_assert(_Alignof(struct bpf_prog_def) == 4, "_Alignof struct bpf_prog_def
 #define BPFLOADER_MAINLINE_U_VERSION      3400 // Android U (34)
 #define BPFLOADER_MAINLINE_V_VERSION      3500 // Android V (35)
 #define BPFLOADER_MAINLINE_25Q2_VERSION   3600 // Android 25Q2 (36.0)
-#define BPFLOADER_MAINLINE_25Q3_VERSION   3602 // Android 25Q3 (36.0+)
 #define BPFLOADER_MAINLINE_25Q4_VERSION   3610 // Android 25Q4 (36.1)
 #define BPFLOADER_MAINLINE_26Q1_VERSION   3612 // Android 26Q1 (36.1+)
 #define BPFLOADER_MAINLINE_26Q2_VERSION   3700 // Android 26Q2 (37.0)
diff --git a/bpf/tests/mts/bpf_existence_test.cpp b/bpf/tests/mts/bpf_existence_test.cpp
index 6849dd414c..948f23b3bd 100644
--- a/bpf/tests/mts/bpf_existence_test.cpp
+++ b/bpf/tests/mts/bpf_existence_test.cpp
@@ -32,7 +32,6 @@ using std::set;
 using std::string;
 
 using android::bpf::isAtLeastKernelVersion;
-using android::bpf::isAtLeastR;
 using android::bpf::isAtLeastS;
 using android::bpf::isAtLeastT;
 using android::bpf::isAtLeastU;