diff --git a/hl7templates/goc-tests/goc-tests-runner/src/test/java/net/ihe/gazelle/goctests/interlay/ValidatorGeneratorTest.java b/hl7templates/goc-tests/goc-tests-runner/src/test/java/net/ihe/gazelle/goctests/interlay/ValidatorGeneratorTest.java
index 9aac0f4f1db2942728def00c01f124e037305580..1d536ee2488c23073387048dc011992a33e8af64 100644
--- a/hl7templates/goc-tests/goc-tests-runner/src/test/java/net/ihe/gazelle/goctests/interlay/ValidatorGeneratorTest.java
+++ b/hl7templates/goc-tests/goc-tests-runner/src/test/java/net/ihe/gazelle/goctests/interlay/ValidatorGeneratorTest.java
@@ -28,7 +28,7 @@ public class ValidatorGeneratorTest {
         String output = "/home/nab@kereval.com/IdeaProjects/GOCWorkspace/X-healthValidator4";
         String mvn = "/home/nab@kereval.com/apache-maven-3.5.4-bin/apache-maven-3.5.4/bin/mvn";
         GenerationConfiguration generationConfiguration = new GenerationConfiguration(new File(bbr).toURI().toURL(),output,mvn);
-        generationConfiguration.setHl7Conf("cdaxehealth");
+        //generationConfiguration.setHl7Conf("cdaxehealth");
         try {
             GeneratedValidator validator = validatorGenerator.generateValidator(generationConfiguration);
             org.junit.Assert.assertTrue(validator.getValidatorBinaryPath() != null);
diff --git a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/OCLGenerator.java b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/OCLGenerator.java
index 2383ba015cd7a9f8516ddc2ee6838997c27a8870..0abbc956faac6cd72eda836b0e6c4e7f09c09825 100644
--- a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/OCLGenerator.java
+++ b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/OCLGenerator.java
@@ -464,10 +464,7 @@ public class OCLGenerator {
         selectionRule.append("->").append(selectionStatement);
         ImportElementHandler.handleAddingElement("CommonOperationsStatic");
         String newFullRule = constraint.replace(rdName, selectionRule);
-        System.out.println("Before: "+constraint);
-        System.out.println("After: "+newFullRule);
         newFullRule = updateOcIsUndefinedRule(newFullRule, selectionStatement, rdName);
-        System.out.println("After update: "+newFullRule);
         return newFullRule;
 
     }