diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index bf99afcfa..8d9505242 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -32,7 +32,6 @@ Meteor.startup(() => {
 
 Template.viewer.onCreated(() => {
     Session.set('ViewerReady', false);
-    console.warn('>>>>viewer.data', Template.instance().data);
 
     const instance = Template.instance();
 
diff --git a/Packages/ohif-measurements/client/conformance/CriteriaEvaluator.js b/Packages/ohif-measurements/client/conformance/CriteriaEvaluator.js
index eff47f41f..4f69082c7 100644
--- a/Packages/ohif-measurements/client/conformance/CriteriaEvaluator.js
+++ b/Packages/ohif-measurements/client/conformance/CriteriaEvaluator.js
@@ -25,10 +25,13 @@ export class CriteriaEvaluator {
     }
 
     getMaxTargets() {
-        let result;
+        let result = 0;
         _.each(this.criteria, criterion => {
             if (criterion instanceof Criteria.MaxTargetsCriterion) {
-                result = criterion.options.limit;
+                const { limit } = criterion.options;
+                if (limit > result) {
+                    result = limit;
+                }
             }
         });
         return result;
diff --git a/Packages/ohif-viewerbase/client/lib/prepareViewerData.js b/Packages/ohif-viewerbase/client/lib/prepareViewerData.js
index fe5579426..7c4c5bf8b 100644
--- a/Packages/ohif-viewerbase/client/lib/prepareViewerData.js
+++ b/Packages/ohif-viewerbase/client/lib/prepareViewerData.js
@@ -44,7 +44,6 @@ export const prepareViewerData = ({ studyInstanceUids, timepointId, timepointsFi
             // Find the timepoint by ID and load the studies from it
             OHIF.studylist.timepointApi.retrieveTimepoints(timepointsFilter).then(() => {
                 const viewerData = buildViewerDataFromTimepointId(timepointId);
-                console.warn('>>>>', viewerData);
                 processData(viewerData);
             }).catch(reject);
         }