@@ -4,20 +4,12 @@
 package com.microsoft.azure.synapse.ml.services.geospatial
 
 import com.microsoft.azure.synapse.ml.Secrets
-import com.microsoft.azure.synapse.ml.build.BuildInfo
-import com.microsoft.azure.synapse.ml.services.URLEncodingUtils
 import com.microsoft.azure.synapse.ml.core.test.fuzzing.{TestObject, TransformerFuzzing}
-import com.microsoft.azure.synapse.ml.services.geospatial.AzureMapsJsonProtocol._
-import com.microsoft.azure.synapse.ml.io.http.{HeaderValues, RESTHelpers}
 import com.microsoft.azure.synapse.ml.stages.{FixedMiniBatchTransformer, FlattenBatch}
-import org.apache.http.client.methods.{HttpDelete, HttpGet, HttpPost}
-import org.apache.http.entity.StringEntity
 import org.apache.spark.ml.util.MLReadable
 import org.apache.spark.sql.DataFrame
 import org.apache.spark.sql.functions.col
 
-import java.net.URI
-
 trait AzureMapsKey {
   lazy val azureMapsKey: String = sys.env.getOrElse("AZURE_MAPS_KEY", Secrets.AzureMapsKey)
 }
@@ -158,4 +150,5 @@ class AzMapsSearchReverseAddressSuite extends TransformerFuzzing[ReverseAddressG
 // AzMapsPointInPolygonSuite was removed because the Azure Maps Spatial service
 // was retired on September 30, 2025. The CheckPointInPolygon transformer now
 // throws UnsupportedOperationException on transform().
+// Keep its offline request, schema, retirement-error, and persistence coverage in GeospatialCoreSuite.
 // See: https://azure.microsoft.com/en-us/updates/v2/azure-maps-creator-services-retirement-on-30-september-2025
@@ -164,4 +164,40 @@ class GeospatialCoreSuite extends TestBase {
     }
     assert(retiredError.getMessage.contains("retired on September 30, 2025"))
   }
+
+  test("retired checkpoint stage preserves scalar and column parameters through save and load") {
+    val input = Seq((Seq(47.6418), Seq(-122.1275), "udid-1")).toDF("latitude", "longitude", "udid")
+    val scalar = new CheckPointInPolygon()
+      .setLatitude(47.6418)
+      .setLongitude(-122.1275)
+      .setUserDataIdentifier("udid-1")
+    val columns = new CheckPointInPolygon()
+      .setLatitudeCol("latitude")
+      .setLongitudeCol("longitude")
+      .setUserDataIdentifierCol("udid")
+
+    Seq(scalar, columns).zipWithIndex.foreach { case (stage, index) =>
+      stage.setSubscriptionKey("fake-key")
+        .setGeography("us")
+        .setOutputCol("pointInPolygon")
+        .setErrorCol("pointInPolygonError")
+      val expectedSchema = stage.transformSchema(input.schema)
+      val path = tmpDir.resolve(s"checkpoint-$index").toString
+      stage.write.save(path)
+      val loaded = CheckPointInPolygon.load(path)
+
+      assert(loaded.uid == stage.uid)
+      assert(loaded.getUrl == stage.getUrl)
+      assert(loaded.getSubscriptionKey == "fake-key")
+      assert(loaded.getOrDefault(loaded.latitude) == stage.getOrDefault(stage.latitude))
+      assert(loaded.getOrDefault(loaded.longitude) == stage.getOrDefault(stage.longitude))
+      assert(loaded.getOrDefault(loaded.userDataIdentifier) == stage.getOrDefault(stage.userDataIdentifier))
+      assert(loaded.transformSchema(input.schema) == expectedSchema)
+
+      val error = intercept[UnsupportedOperationException] {
+        loaded.transform(input)
+      }
+      assert(error.getMessage.contains("retired on September 30, 2025"))
+    }
+  }
 }
@@ -40,10 +40,8 @@ class VerifyIndexToValue extends ValueIndexerUtilities with TransformerFuzzing[I
   private val testName = col + "_noncat"
 
   test("Test: Going to Categorical and Back") {
-    for (mmlStyle <- List(false, true)) { // TODO this is not used?
-      val df1 = new IndexToValue().setInputCol(newName).setOutputCol(testName).transform(df2)
-      df1.select(col, testName).collect.foreach(row => assert(row(0) == row(1), "two columns should be the same"))
-    }
+    val df1 = new IndexToValue().setInputCol(newName).setOutputCol(testName).transform(df2)
+    df1.select(col, testName).collect.foreach(row => assert(row(0) == row(1), "two columns should be the same"))
   }
 
   override def testObjects(): scala.Seq[TestObject[IndexToValue]] = Seq(new TestObject(
@@ -79,17 +77,15 @@ class VerifyValueIndexer extends ValueIndexerUtilities with EstimatorFuzzing[Val
     val col = "string"
     val trueLevels = df.select("string").collect().map(_(0).toString).distinct.sorted
 
-    for (mmlStyle <- List(false, true)) { // TODO this is not used?
-      val newName = col + "_cat"
-      val df2 = new ValueIndexer().setInputCol(col).setOutputCol(newName).fit(df).transform(df)
+    val newName = col + "_cat"
+    val df2 = new ValueIndexer().setInputCol(col).setOutputCol(newName).fit(df).transform(df)
 
-      val map = CategoricalUtilities.getMap[String](df2.schema(newName).metadata)
+    val map = CategoricalUtilities.getMap[String](df2.schema(newName).metadata)
 
-      val levels = map.levels.sorted
+    val levels = map.levels.sorted
 
-      (trueLevels zip levels).foreach {
-        case (a, b) => assert(a == b, "categorical levels are not the same")
-      }
+    (trueLevels zip levels).foreach {
+      case (a, b) => assert(a == b, "categorical levels are not the same")
     }
   }
 
 
@@ -0,0 +1,64 @@
+# Test retirement review
+
+Reviewed the agent's exact four-file patch and evidence report against
+`714d365e71f6d2db5b7072094a4a3ad22485eb57`. No unresolved finding.
+
+## Removal decisions
+
+| Candidate | Decision and evidence |
+| --- | --- |
+| `tools/pytest/run_all_tests.py` | Remove. Its Scala 2.11 output path and `synapseml` test namespace do not match the current build. Tracked-text caller search found no caller. `CodegenPlugin.testPython` already invokes pytest/JUnit against `synapsemltest`; that replacement exists even at the available February 2023 history boundary. No current tests or dependency pins are removed. |
+| Two `mmlStyle` loops in `VerifyValueIndexer.scala` | Remove only the loop wrappers. Neither body reads the loop variable, so both iterations have identical inputs and assertions. Both named tests, every assertion, inherited fuzzing, and the genuine metadata-style test in `TestCategoricals.scala` remain. |
+| Azure Maps Spatial live tests | Already removed by microsoft/SynapseML#2485. Remove only orphaned imports now; retain address-geocoder suites and offline retired-stage contracts. Add scalar/column save-load coverage because the retired stage cannot use the ordinary live serialization fuzzer. |
+| Form Recognizer v2.1, Text Analytics, legacy OCR, OpenAI deprecated aliases | Retain. Deprecated public APIs and compatibility stubs still need contract coverage. No already-passed retirement was established for these remaining live endpoints. |
+| Ignored null/NaN, performance, slow service and model tests | Retain. Ignored, slow, or old does not establish redundancy or obsolescence. |
+
+The audit covered 396 tracked test-source/helper files and examined the unused
+runner separately. It found no nonempty whole-file duplicates. This is not a
+claim of complete semantic deduplication.
+
+## Review evidence
+
+- Correctness: the categorical edit only removes duplicate execution. No named
+  test or assertion is deleted; the old ignored null/NaN case remains.
+- Architecture and compatibility: no production class, public signature,
+  dependency, generated file, or active runner changes. Offline Maps coverage
+  protects the retained reader and serialized scalar/column parameter shapes.
+- Edge cases: persistence checks UID, endpoint, fake subscription key,
+  coordinates/UDID, output/error schema, and the explicit retirement exception
+  after load. Both scalar and column-bound instances are exercised.
+- Resource safety: the added test uses the suite's managed temporary directory
+  and cannot send HTTP because the retired transform throws immediately.
+- Validation: baseline categorical tests passed before the edit. Final affected
+  main/Test compilation and scalastyle passed under JDK 11. Twenty-seven
+  distinct tests passed across six suites, with one pre-existing ignored case
+  unchanged. The codegen suites validate the active generated-test path.
+  Black 22.3.0 passed for 206 Python files; whitespace checks passed.
+- Documentation: the existing Maps removal comment now points to the offline
+  coverage. Detailed retained/rejected candidates and source evidence belong in
+  the PR description rather than a new contributor rule.
+
+## Limits
+
+No live Azure tests were run. There is no claim of measured pipeline wall-clock
+savings: the deleted runner was unused and the loop change removes two Spark
+test passes. No newly retired service suite was found to delete.
+
+Official lifecycle references checked by the audit:
+
+- [Bing Search retirement](https://learn.microsoft.com/en-us/lifecycle/announcements/bing-search-api-retirement).
+  Those tests were already removed.
+- [Document Intelligence lifecycle table](https://learn.microsoft.com/en-us/azure/ai-services/document-intelligence/overview?view=doc-intel-4.0.0).
+  The audit found v2.1 support ending September 15, 2027, not an already-retired endpoint.
+- [Anomaly Detector overview](https://learn.microsoft.com/en-us/azure/ai-services/anomaly-detector/overview).
+  Its October 1, 2026 retirement is still future at the September 21 audit date;
+  its tests had already been removed in the repository.
+
+The Azure Maps announcement redirected to an application shell, so its text
+was not independently recovered. Existing source/history establishes why the
+old live test is absent, not a new deletion decision.
+
+This is a direct review, not a completed six-round, three-family gauntlet.
+The advertised Gemini reviewers failed to launch with HTTP 400 during this
+task. GPT and Opus reviews were available for the larger companion CI change.
+Current-head Azure validation and GitHub review remain separate PR gates.