diff --git a/FEXCore/include/FEXCore/Core/CoreState.h b/FEXCore/include/FEXCore/Core/CoreState.h
index ea69ed3e4..b60909b0d 100644
--- a/FEXCore/include/FEXCore/Core/CoreState.h
+++ b/FEXCore/include/FEXCore/Core/CoreState.h
@@ -353,7 +353,6 @@ struct JITPointers {
     uint64_t ExitFunctionLinker {};
     uint64_t ThreadStopHandlerSpillSRA {};
     uint64_t ThreadPauseHandlerSpillSRA {};
-    uint64_t UnimplementedInstructionHandler {};
     uint64_t GuestSignal_SIGILL {};
     uint64_t GuestSignal_SIGTRAP {};
     uint64_t GuestSignal_SIGSEGV {};
@@ -371,8 +370,6 @@ struct JITPointers {
       // Process specific
       uint64_t LUDIV {};
       uint64_t LDIV {};
-      uint64_t LUREM {};
-      uint64_t LREM {};
 
       // Thread Specific
 
@@ -381,8 +378,6 @@ struct JITPointers {
        * @{ */
       uint64_t LUDIVHandler {};
       uint64_t LDIVHandler {};
-      uint64_t LUREMHandler {};
-      uint64_t LREMHandler {};
       /**  @} */
     } AArch64;
 
diff --git a/unittests/InstructionCountCI/AVX128/FMA4.json b/unittests/InstructionCountCI/AVX128/FMA4.json
index 3397b9948..b9ed7c03d 100644
--- a/unittests/InstructionCountCI/AVX128/FMA4.json
+++ b/unittests/InstructionCountCI/AVX128/FMA4.json
@@ -19,7 +19,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -33,7 +33,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -47,7 +47,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -61,7 +61,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -75,7 +75,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -89,7 +89,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -103,7 +103,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -117,7 +117,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -131,7 +131,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -145,7 +145,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -159,7 +159,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -173,7 +173,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -187,7 +187,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -201,7 +201,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -215,7 +215,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -229,7 +229,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -243,7 +243,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -257,7 +257,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -271,7 +271,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -285,7 +285,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -299,7 +299,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -313,7 +313,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -327,7 +327,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -341,7 +341,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -355,7 +355,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -369,7 +369,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -383,7 +383,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -397,7 +397,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -411,7 +411,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     },
@@ -425,7 +425,7 @@
         "str x20, [x28, #24]",
         "mov w1, #0x401",
         "str x1, [x28, #1488]",
-        "ldr x0, [x28, #2880]",
+        "ldr x0, [x28, #2872]",
         "br x0"
       ]
     }
diff --git a/unittests/InstructionCountCI/PrimaryGroup.json b/unittests/InstructionCountCI/PrimaryGroup.json
index 09aa2f721..ff965d85c 100644
--- a/unittests/InstructionCountCI/PrimaryGroup.json
+++ b/unittests/InstructionCountCI/PrimaryGroup.json
@@ -2786,7 +2786,7 @@
         "mov x0, x5",
         "mov x1, x4",
         "mov x2, x6",
-        "ldr x3, [x28, #3584]",
+        "ldr x3, [x28, #3568]",
         "str x30, [sp, #-16]!",
         "blr x3",
         "ldr x30, [sp], #16",
@@ -2837,7 +2837,7 @@
         "mov x0, x5",
         "mov x1, x4",
         "mov x2, x6",
-        "ldr x3, [x28, #3592]",
+        "ldr x3, [x28, #3576]",
         "str x30, [sp, #-16]!",
         "blr x3",
         "ldr x30, [sp], #16",