diff --git a/pom.xml b/pom.xml
index cd08e13..329070b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,16 +67,20 @@
         </dependency>
 
         <!-- Needed for Email subscriptions -->
+<!--        <dependency>-->
+<!--            <groupId>com.sun.mail</groupId>-->
+<!--            <artifactId>javax.mail</artifactId>-->
+<!--            <version>1.6.2</version>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>javax.activation</groupId>-->
+<!--                    <artifactId>activation</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>1.6.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>activation</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.simplejavamail</groupId>
+            <artifactId>simple-java-mail</artifactId>
         </dependency>
 
         <!-- This dependency includes the core HAPI-FHIR classes -->
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 b1ec01c..1ad5256 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -17,7 +17,7 @@ spring:
     properties:
       hibernate.format_sql: false
       hibernate.show_sql: false
-  #      hibernate.dialect: org.hibernate.dialect.h2dialect
+      hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect
   #      hibernate.hbm2ddl.auto: update
   #      hibernate.jdbc.batch_size: 20
   #      hibernate.cache.use_query_cache: false
@@ -87,7 +87,7 @@ hapi:
     #    filter_search_enabled: true
     #    graphql_enabled: true
     #    narrative_enabled: true
-    #    mdm_enabled: true
+    mdm_enabled: true
     #    partitioning:
     #      allow_references_across_partitions: false
     #      partitioning_include_in_search_hashes: false