diff --git a/client/java/opensysml-client/src/main/java/org/openmbee/opensysml/CheckResult.java b/client/java/opensysml-client/src/main/java/org/openmbee/opensysml/CheckResult.java
index 3bbb4a97ea..8a509ea086 100644
--- a/client/java/opensysml-client/src/main/java/org/openmbee/opensysml/CheckResult.java
+++ b/client/java/opensysml-client/src/main/java/org/openmbee/opensysml/CheckResult.java
@@ -39,7 +39,7 @@ public record CheckResult(
     Standing standing,
     String reason) {
 
-  private static final String WITNESS = "witness";
+  private static final String WITNESS_NAME = "witness";
 
   /** Creates a check result; every list is copied. */
   public CheckResult {
@@ -52,7 +52,7 @@ public record CheckResult(
     Objects.requireNonNull(claim, "claim");
     freeInputs = List.copyOf(freeInputs);
     assumptions = List.copyOf(assumptions);
-    Objects.requireNonNull(witness, WITNESS);
+    Objects.requireNonNull(witness, WITNESS_NAME);
     Objects.requireNonNull(contrast, "contrast");
     Objects.requireNonNull(standing, "standing");
     Objects.requireNonNull(reason, "reason");
@@ -120,7 +120,7 @@ public record Violation(
       Objects.requireNonNull(kind, "kind");
       Objects.requireNonNull(property, "property");
       Objects.requireNonNull(error, "error");
-      Objects.requireNonNull(witness, WITNESS);
+      Objects.requireNonNull(witness, WITNESS_NAME);
       Objects.requireNonNull(text, "text");
     }
   }
@@ -135,7 +135,7 @@ public record DivergentValue(String value, Optional<Witness> witness) {
     /** Creates a divergent value. */
     public DivergentValue {
       Objects.requireNonNull(value, "value");
-      Objects.requireNonNull(witness, WITNESS);
+      Objects.requireNonNull(witness, WITNESS_NAME);
     }
   }
 
@@ -165,7 +165,7 @@ public record Final(String outcome, Map<String, String> values, Optional<Witness
     public Final {
       Objects.requireNonNull(outcome, "outcome");
       values = Map.copyOf(values);
-      Objects.requireNonNull(witness, WITNESS);
+      Objects.requireNonNull(witness, WITNESS_NAME);
     }
   }
 
diff --git a/client/java/opensysml-conformance/src/main/java/org/openmbee/opensysml/conformance/Api.java b/client/java/opensysml-conformance/src/main/java/org/openmbee/opensysml/conformance/Api.java
index 1fe27d42b0..50653e6e94 100644
--- a/client/java/opensysml-conformance/src/main/java/org/openmbee/opensysml/conformance/Api.java
+++ b/client/java/opensysml-conformance/src/main/java/org/openmbee/opensysml/conformance/Api.java
@@ -91,7 +91,6 @@
 import org.openmbee.opensysml.proto.CompareResultsResponse;
 import org.openmbee.opensysml.proto.ImportDataRequest;
 import org.openmbee.opensysml.proto.ImportDataResponse;
-import org.openmbee.opensysml.proto.ObservablePair;
 import java.util.OptionalDouble;
 import java.util.OptionalLong;
 import org.openmbee.opensysml.proto.CheckBehaviorRequest;