diff --git a/src/cli/java/org/commcare/util/screen/EntityScreen.java b/src/cli/java/org/commcare/util/screen/EntityScreen.java
index f37dc74de..5768fc875 100755
--- a/src/cli/java/org/commcare/util/screen/EntityScreen.java
+++ b/src/cli/java/org/commcare/util/screen/EntityScreen.java
@@ -97,7 +97,6 @@ public EntityScreen(boolean handleCaseIndex, boolean needsFullInit, SessionWrapp
     public void evaluateAutoLaunch(String nextInput) throws CommCareSessionException {
         EvaluationContext subContext = getAutoLaunchEvaluationContext(nextInput);
         for (Action action : mShortDetail.getCustomActions(evalContext)) {
-            System.out.println("in evaluateAutoLaunch, action: " + action);
             if (action.isAutoLaunchAction(subContext)) {
                 // Supply an empty case list so we can "select" from it later using getEntityFromID
                 mCurrentScreen = new EntityListSubscreen(mShortDetail, new Vector<>(), evalContext,
@@ -236,13 +235,10 @@ protected void setSession(SessionWrapper session) throws CommCareSessionExceptio
         }
 
         evalContext = mSession.getEvaluationContext();
-        System.out.println("in setSession, evalContext: " + evalContext);
     }
 
     @Trace
     private Vector<TreeReference> expandEntityReferenceSet(EvaluationContext context) {
-        System.out.println("in expandEntityReferenceSet, mNeededDatum: " + mNeededDatum);
-        System.out.println("in expandEntityReferenceSet, mNeededDatum.getNodeset(): " + mNeededDatum.getNodeset());
         return evalContext.expandReference(mNeededDatum.getNodeset());
     }
 
@@ -510,8 +506,6 @@ public boolean evalAndExecuteAutoLaunchAction(String nextInput, CommCareSession
             throws CommCareSessionException {
         evaluateAutoLaunch(nextInput);
         if (getAutoLaunchAction() != null) {
-            // JT NOTE for some reason, when autoselect for entry datum is true, this evaluates to false 
-            // when autoselect for entry datum is false, it evaluates to true
             setPendingAction(getAutoLaunchAction());
             executePendingAction(session);
             return true;
diff --git a/src/cli/java/org/commcare/util/screen/MultiSelectEntityScreen.java b/src/cli/java/org/commcare/util/screen/MultiSelectEntityScreen.java
index b34a3678a..e479c5518 100644
--- a/src/cli/java/org/commcare/util/screen/MultiSelectEntityScreen.java
+++ b/src/cli/java/org/commcare/util/screen/MultiSelectEntityScreen.java
@@ -25,8 +25,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import java.util.Arrays;
-
 /**
  * Variation of EntityScreen to allow for selection of multiple entities at once
  */
@@ -72,28 +70,21 @@ public void updateSelection(String input, TreeReference[] selectedRefs)
 
     @Override
     protected boolean shouldAutoSelect() {
-        // System.out.println("in show autoselect");
-        // System.out.println("mneededdatum " + mNeededDatum);
         return mNeededDatum.isAutoSelectEnabled() && references.size() != 0;
     }
 
     @Override
     public boolean autoSelectEntities(SessionWrapper session) {
-        System.out.println("Starting autoSelectEntities with " + references.size() + " references");
         int selectionSize = references.size();
         if (validateSelectionSize(selectionSize)) {
-            System.out.println("Selection size " + selectionSize + " validated successfully");
             String[] evaluatedValues = new String[selectionSize];
             for (int i = 0; i < selectionSize; i++) {
                 evaluatedValues[i] = getReturnValueFromSelection(references.elementAt(i));
-                System.out.println("Evaluated value " + (i + 1) + ": " + evaluatedValues[i]);
             }
             processSelectionIntoInstance(evaluatedValues, getNeededDatumId());
-            System.out.println("Processed selection into instance with datum ID: " + getNeededDatumId());
             updateSession(session);
             return true;
         }
-        System.out.println("Auto-selection failed validation check");
         return false;
     }
 
@@ -178,8 +169,6 @@ private void processSelectedValues(String[] selectedValues)
                 TreeReference currentReference = getAndValidateEntityReference(selectedValues[i]);
                 evaluatedValues[i] = getReturnValueFromSelection(currentReference);
             }
-            System.out.println("in processSelectedValues, evaluatedValues: " + Arrays.toString(evaluatedValues));
-            System.out.println("in processSelectedValues, getNeededDatumId(): " + getNeededDatumId());
             processSelectionIntoInstance(evaluatedValues, getNeededDatumId());
         }
     }
diff --git a/src/main/java/org/commcare/suite/model/EntityDatum.java b/src/main/java/org/commcare/suite/model/EntityDatum.java
index d49e81d10..13da7eaa9 100644
--- a/src/main/java/org/commcare/suite/model/EntityDatum.java
+++ b/src/main/java/org/commcare/suite/model/EntityDatum.java
@@ -155,13 +155,4 @@ public TreeReference getEntityFromID(EvaluationContext ec, String elementId) {
             return null;
         }
     }
-
-    @Override
-    public String toString() {
-        return "EntityDatum{" +
-                "nodeset=" + nodeset +
-                ", shortDetail='" + shortDetail + '\'' +
-                ", autoSelectEnabled=" + autoSelectEnabled +
-                '}';
-    }
 }