diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
index ddba371..fb99b7f 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
@@ -10,6 +10,7 @@ import ca.uhn.fhir.jpa.model.entity.ModelConfig;
 import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionDeliveryHandlerFactory;
 import ca.uhn.fhir.jpa.subscription.match.deliver.email.EmailSenderImpl;
 import ca.uhn.fhir.jpa.subscription.match.deliver.email.IEmailSender;
+import ca.uhn.fhir.rest.server.mail.IMailSvc;
 import ca.uhn.fhir.rest.server.mail.MailConfig;
 import ca.uhn.fhir.rest.server.mail.MailSvc;
 import com.google.common.base.Strings;
@@ -220,7 +221,8 @@ public class FhirServerConfigCommon {
       mailConfig.setSmtpPassword(email.getPassword());
       mailConfig.setSmtpUseStartTLS(email.getStartTlsEnable());
 
-		IEmailSender emailSender = new EmailSenderImpl(new MailSvc(mailConfig));
+		 IMailSvc mailSvc = new MailSvc(mailConfig);
+		 IEmailSender emailSender = new EmailSenderImpl(mailSvc);
 
 		subscriptionDeliveryHandlerFactory.ifPresent(theSubscriptionDeliveryHandlerFactory -> theSubscriptionDeliveryHandlerFactory.setEmailSender(emailSender));
 
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java
index 301c883..39718f6 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java
@@ -24,11 +24,6 @@ import org.springframework.core.io.Resource;
 @Import({MdmConsumerConfig.class, MdmSubmitterConfig.class})
 public class MdmConfig {
 
-	@Bean
-	MdmRuleValidator mdmRuleValidator(FhirContext theFhirContext, ISearchParamRegistry theSearchParamRegistry) {
-		return new MdmRuleValidator(theFhirContext, theSearchParamRegistry);
-	}
-
 	@Bean
 	IMdmSettings mdmSettings(@Autowired MdmRuleValidator theMdmRuleValidator, AppProperties appProperties) throws IOException {
 		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
@@ -36,5 +31,4 @@ public class MdmConfig {
 		String json = IOUtils.toString(resource.getInputStream(), Charsets.UTF_8);
 		return new MdmSettings(theMdmRuleValidator).setEnabled(appProperties.getMdm_enabled()).setScriptText(json);
 	}
-
 }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 73c5418..7ea0ccc 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -99,6 +99,7 @@ hapi:
     #    mdm_enabled: true
 #    local_base_urls:
 #      - https://hapi.fhir.org/baseR4
+    mdm_enabled: true
     #    partitioning:
     #      allow_references_across_partitions: false
     #      partitioning_include_in_search_hashes: false