From f9bafe4074c481230503b70fc2c732f07ea72180 Mon Sep 17 00:00:00 2001
From: ajpotts <ajpotts@users.noreply.github.com>
Date: Fri, 27 Feb 2026 15:49:34 -0500
Subject: [PATCH] Closes #5446:  Remove Unnecessary compat modules

---
 src/ArgSortMsg.chpl                     | 2 +-
 src/CheckpointMsg.chpl                  | 2 +-
 src/DynamicSort.chpl                    | 6 +++---
 src/RadixSortLSD.chpl                   | 2 +-
 src/RandMsg.chpl                        | 2 +-
 src/RandUtil.chpl                       | 2 +-
 src/SegStringSort.chpl                  | 2 +-
 src/SortMsg.chpl                        | 2 +-
 src/compat/ge-24/ArkoudaJSONCompat.chpl | 3 ---
 src/compat/ge-24/ArkoudaSortCompat.chpl | 3 ---
 src/compat/ge-24/ArkoudaTimeCompat.chpl | 3 ---
 11 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 src/compat/ge-24/ArkoudaJSONCompat.chpl
 delete mode 100644 src/compat/ge-24/ArkoudaSortCompat.chpl
 delete mode 100644 src/compat/ge-24/ArkoudaTimeCompat.chpl

diff --git a/src/ArgSortMsg.chpl b/src/ArgSortMsg.chpl
index 1675779b228..0c295d6cdec 100644
--- a/src/ArgSortMsg.chpl
+++ b/src/ArgSortMsg.chpl
@@ -11,7 +11,7 @@ module ArgSortMsg
 
     use Time;
     use Math only;
-    private use ArkoudaSortCompat;
+    private use Sort;
     private use DynamicSort;
     
     use Reflection only;
diff --git a/src/CheckpointMsg.chpl b/src/CheckpointMsg.chpl
index 1f7b23f6cdd..5eb0ff05d51 100644
--- a/src/CheckpointMsg.chpl
+++ b/src/CheckpointMsg.chpl
@@ -1,7 +1,7 @@
 module CheckpointMsg {
   use FileSystem;
   use List;
-  use ArkoudaJSONCompat;
+  use JSON;
   import IO, Path, Time;
   import Reflection.{getModuleName as M,
                      getRoutineName as R,
diff --git a/src/DynamicSort.chpl b/src/DynamicSort.chpl
index 7788ee1a50e..6c2a31c6118 100644
--- a/src/DynamicSort.chpl
+++ b/src/DynamicSort.chpl
@@ -1,11 +1,11 @@
 module DynamicSort {
-    private use ArkoudaSortCompat;
+    private use Sort;
 
     proc dynamicTwoArrayRadixSort(ref Data:[], comparator:?rec=new defaultComparator()) {
       if Data._instance.isDefaultRectangular() {
-        ArkoudaSortCompat.TwoArrayRadixSort.twoArrayRadixSort(Data, comparator);
+        Sort.TwoArrayRadixSort.twoArrayRadixSort(Data, comparator);
       } else {
-        ArkoudaSortCompat.sort(Data, comparator);
+        Sort.sort(Data, comparator);
       }
     }
 
diff --git a/src/RadixSortLSD.chpl b/src/RadixSortLSD.chpl
index 483a61e3cf9..fb3ced62a51 100644
--- a/src/RadixSortLSD.chpl
+++ b/src/RadixSortLSD.chpl
@@ -22,7 +22,7 @@ module RadixSortLSD
     use RangeChunk;
     use Logging;
     use ServerConfig;
-    use ArkoudaSortCompat except isSorted;
+    use Sort except isSorted;
 
     private config const logLevel = ServerConfig.logLevel;
     private config const logChannel = ServerConfig.logChannel;
diff --git a/src/RandMsg.chpl b/src/RandMsg.chpl
index 4f0d364393d..f933a5f39d2 100644
--- a/src/RandMsg.chpl
+++ b/src/RandMsg.chpl
@@ -13,7 +13,7 @@ module RandMsg
     use PrivateDist;
     use RandArray;
     use RandUtil;
-    use ArkoudaSortCompat;
+    use Sort;
     use CommAggregation;
     use Repartition;
     use ZigguratConstants;
diff --git a/src/RandUtil.chpl b/src/RandUtil.chpl
index 7254db43131..08cffbc7924 100644
--- a/src/RandUtil.chpl
+++ b/src/RandUtil.chpl
@@ -54,7 +54,7 @@ module RandUtil {
         where D.rank == 1 {
             // use a fixed number of elements per stream instead of relying on number of locales or numTasksPerLoc because these
             // can vary from run to run / machine to mahchine. And it's important for the same seed to give the same results
-            use ArkoudaTimeCompat;
+            use Time;
             var next: rng.eltType;
             if hasSeed {
                 next = rng.next();
diff --git a/src/SegStringSort.chpl b/src/SegStringSort.chpl
index 7fad10f05ef..82c6bffa5d2 100644
--- a/src/SegStringSort.chpl
+++ b/src/SegStringSort.chpl
@@ -1,6 +1,6 @@
 module SegStringSort {
   use SegmentedString;
-  use ArkoudaSortCompat;
+  use Sort;
   use Time;
   use IO;
   use CTypes;
diff --git a/src/SortMsg.chpl b/src/SortMsg.chpl
index 5d69f82434e..8b519f815f6 100644
--- a/src/SortMsg.chpl
+++ b/src/SortMsg.chpl
@@ -4,7 +4,7 @@ module SortMsg
 
     use Time;
     use Math only;
-    use ArkoudaSortCompat only relativeComparator;
+    use Sort only relativeComparator;
     private use DynamicSort;
     use Search only;
     use Reflection;
diff --git a/src/compat/ge-24/ArkoudaJSONCompat.chpl b/src/compat/ge-24/ArkoudaJSONCompat.chpl
deleted file mode 100644
index 1ae83674b11..00000000000
--- a/src/compat/ge-24/ArkoudaJSONCompat.chpl
+++ /dev/null
@@ -1,3 +0,0 @@
-module ArkoudaJSONCompat {
-  public use JSON;
-}
diff --git a/src/compat/ge-24/ArkoudaSortCompat.chpl b/src/compat/ge-24/ArkoudaSortCompat.chpl
deleted file mode 100644
index 7d9c3387666..00000000000
--- a/src/compat/ge-24/ArkoudaSortCompat.chpl
+++ /dev/null
@@ -1,3 +0,0 @@
-module ArkoudaSortCompat {
-  public use Sort;
-}
diff --git a/src/compat/ge-24/ArkoudaTimeCompat.chpl b/src/compat/ge-24/ArkoudaTimeCompat.chpl
deleted file mode 100644
index 0c4e16da996..00000000000
--- a/src/compat/ge-24/ArkoudaTimeCompat.chpl
+++ /dev/null
@@ -1,3 +0,0 @@
-module ArkoudaTimeCompat {
-  public use Time;
-}