diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java
index 97ec14f981c..001cb4ce898 100644
--- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java
+++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java
@@ -295,7 +295,7 @@ public abstract class BaseClinicalReasoningConfig {
 	public ExecutorService cqlExecutor() {
 		CqlThreadFactory factory = new CqlThreadFactory();
 		ExecutorService executor = Executors.
-			newFixedThreadPool(CrProperties.MeasureProperties.DEFAULT_THREADS_BATCH_SIZE
+			newFixedThreadPool(Runtime.getRuntime().availableProcessors()
 			,  factory);
 		executor = new DelegatingSecurityContextExecutorService(executor);
 
diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProperties.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProperties.java
index 2b54e78f629..a6ea33bac93 100644
--- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProperties.java
+++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProperties.java
@@ -65,18 +65,10 @@ public class CrProperties {
 		private MeasureReportConfiguration myMeasureReportConfiguration;
 		private MeasureEvaluationOptions myMeasureEvaluationOptions;
 
-		public static final int DEFAULT_THREADS_FOR_MEASURE_EVAL = 4;
-		public static final int DEFAULT_THREADS_BATCH_SIZE = 250;
-		public static final boolean DEFAULT_THREADS_ENABLED_FOR_MEASURE_EVAL = true;
-
 		public MeasureProperties() {
 			myMeasureEvaluationOptions = MeasureEvaluationOptions.defaultOptions();
-			myMeasureEvaluationOptions.setNumThreads(DEFAULT_THREADS_FOR_MEASURE_EVAL);
-			myMeasureEvaluationOptions.setThreadedBatchSize(DEFAULT_THREADS_BATCH_SIZE);
-			myMeasureEvaluationOptions.setThreadedEnabled(DEFAULT_THREADS_ENABLED_FOR_MEASURE_EVAL);
 		};
 
-
 		//care gaps
 		public boolean getThreadedCareGapsEnabled() {
 			return myThreadedCareGapsEnabled;
diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureService.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureService.java
index 05a9b9f07c0..9fd2a64b404 100644
--- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureService.java
+++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureService.java
@@ -55,7 +55,6 @@ import javax.inject.Named;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
 
 import static ca.uhn.fhir.cr.constant.MeasureReportConstants.COUNTRY_CODING_SYSTEM_CODE;
 import static ca.uhn.fhir.cr.constant.MeasureReportConstants.MEASUREREPORT_MEASURE_SUPPLEMENTALDATA_EXTENSION;
@@ -132,10 +131,6 @@ public class MeasureService implements IDaoRegistryUser {
 	@Autowired
 	protected DaoRegistry myDaoRegistry;
 
-	@Autowired
-	@Named("cqlExecutor")
-	private ExecutorService myCqlExecutor;
-
 	protected RequestDetails myRequestDetails;
 	/**
 	 * Get The details (such as tenant) of this request. Usually auto-populated HAPI.
@@ -188,8 +183,6 @@ public class MeasureService implements IDaoRegistryUser {
 
 		TerminologyProvider terminologyProvider;
 
-		myMeasureEvaluationOptions.setMeasureExecutor(myCqlExecutor);
-
 		if (theTerminologyEndpoint != null) {
 			IGenericClient client = Clients.forEndpoint(getFhirContext(), theTerminologyEndpoint);
 			terminologyProvider = new Dstu3FhirTerminologyProvider(client);
diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureService.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureService.java
index fb1cf9a488b..70492495781 100644
--- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureService.java
+++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureService.java
@@ -64,8 +64,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
 
 import static ca.uhn.fhir.cr.constant.MeasureReportConstants.COUNTRY_CODING_SYSTEM_CODE;
 import static ca.uhn.fhir.cr.constant.MeasureReportConstants.MEASUREREPORT_MEASURE_SUPPLEMENTALDATA_EXTENSION;
@@ -144,10 +142,6 @@ public class MeasureService implements IDaoRegistryUser {
 	@Autowired
 	protected DaoRegistry myDaoRegistry;
 
-	@Autowired
-	@Named("cqlExecutor")
-	private ExecutorService myCqlExecutor;
-
 	protected RequestDetails myRequestDetails;
 
 	public RequestDetails getRequestDetails() {
@@ -201,8 +195,6 @@ public class MeasureService implements IDaoRegistryUser {
 
 		TerminologyProvider terminologyProvider;
 
-		myMeasureEvaluationOptions.setMeasureExecutor(myCqlExecutor);
-
 		if (theTerminologyEndpoint != null) {
 			IGenericClient client = Clients.forEndpoint(getFhirContext(), theTerminologyEndpoint);
 			terminologyProvider = new R4FhirTerminologyProvider(client);