diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderFactory.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderFactory.java
index bed7443..4b75fe2 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderFactory.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderFactory.java
@@ -12,9 +12,7 @@ import ca.uhn.fhir.cr.dstu3.measure.MeasureOperationsProvider;
 import ca.uhn.fhir.cr.dstu3.plandefinition.PlanDefinitionOperationsProvider;
 import ca.uhn.fhir.cr.dstu3.questionnaire.QuestionnaireOperationsProvider;
 import ca.uhn.fhir.cr.dstu3.questionnaireresponse.QuestionnaireResponseOperationsProvider;
-import org.springframework.stereotype.Service;
 
-@Service
 public class CrOperationProviderFactory {
 	@Autowired
 	private FhirContext myFhirContext;
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java
index 83a238d..199b564 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java
@@ -83,10 +83,5 @@ public class StarterCrDstu3Config {
 		EvaluationSettings theEvaluationSettings) {
 		return r -> new PlanDefinitionProcessor(r, theEvaluationSettings);
 	}
-
-	@Bean
-	IRepositoryFactory repositoryFactory(DaoRegistry theDaoRegistry) {
-		return rd -> new HapiFhirRepository(theDaoRegistry, rd, (RestfulServer) rd.getServer());
-	}
 }
 
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
index acfc492..ce0a2a2 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
@@ -83,9 +83,4 @@ public class StarterCrR4Config {
 		EvaluationSettings theEvaluationSettings) {
 		return r -> new PlanDefinitionProcessor(r, theEvaluationSettings);
 	}
-
-	@Bean
-	IRepositoryFactory repositoryFactory(DaoRegistry theDaoRegistry) {
-		return rd -> new HapiFhirRepository(theDaoRegistry, rd, (RestfulServer) rd.getServer());
-	}
 }