diff --git a/ls/server/pom.xml b/ls/server/pom.xml
index c10497c..2698652 100644
--- a/ls/server/pom.xml
+++ b/ls/server/pom.xml
@@ -61,58 +61,58 @@
 <!--            <groupId>info.cqframework</groupId>-->
 <!--            <artifactId>elm-fhir</artifactId>-->
 <!--        </dependency>-->
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-client</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>hapi-fhir-client</artifactId>-->
+<!--        </dependency>-->
 
         <!-- Core FHIR dependencies -->
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.r4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.r4b</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.r5</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.convertors</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.utilities</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.r4</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.r4b</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.r5</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.convertors</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.utilities</artifactId>-->
+<!--        </dependency>-->
 
         <!-- Additional HAPI FHIR Dependencies the Engine does not import -->
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-structures-dstu3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-structures-r4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-validation-resources-r4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-structures-r5</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-validation-resources-r5</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>hapi-fhir-structures-dstu3</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>hapi-fhir-validation-resources-dstu3</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>hapi-fhir-structures-r4</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>hapi-fhir-validation-resources-r4</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>hapi-fhir-structures-r5</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>hapi-fhir-validation-resources-r5</artifactId>-->
+<!--        </dependency>-->
 
         <!-- Java implementation of VS Code language server protocol -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index 320885a..999c958 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,12 @@
         <jackson-2.version>2.5.0</jackson-2.version>
         <jersey-2.version>2.10</jersey-2.version>
         <cqframework.version>3.3.2</cqframework.version>
-        <fhir-core.version>5.6.36</fhir-core.version>
+<!--        <fhir-core.version>5.6.36</fhir-core.version>-->
         <cqf-fhir-cr.version>3.0.0-PRE9</cqf-fhir-cr.version>
-        <hapi.version>6.0.1</hapi.version>
+<!--        <hapi.version>6.0.1</hapi.version>-->
         <picocli.version>4.6.1</picocli.version>
-        <cql-engine.version>2.3.0</cql-engine.version>
-        <cql-evaluator.version>2.3.0</cql-evaluator.version>
+<!--        <cql-engine.version>2.3.0</cql-engine.version>-->
+<!--        <cql-evaluator.version>2.3.0</cql-evaluator.version>-->
         <auto-service.version>1.0</auto-service.version>
         <slf4j.version>1.7.29</slf4j.version>
         <spring.boot.version>2.7.2</spring.boot.version>
@@ -221,82 +221,82 @@
 <!--                <artifactId>engine.fhir</artifactId>-->
 <!--                <version>${cql-engine.version}</version>-->
 <!--            </dependency>-->
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-structures-dstu2</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-structures-dstu3</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-structures-r4</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-validation-resources-r4</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-structures-r5</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-validation-resources-r5</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>hapi-fhir-client</artifactId>
-                <version>${hapi.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-structures-dstu2</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-validation-resources-dstu2</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-structures-dstu3</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-validation-resources-dstu3</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-structures-r4</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-validation-resources-r4</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-structures-r5</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-validation-resources-r5</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>hapi-fhir-client</artifactId>-->
+<!--                <version>${hapi.version}</version>-->
+<!--            </dependency>-->
             <!-- Core FHIR dependencies -->
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>org.hl7.fhir.r4</artifactId>
-                <version>${fhir-core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>org.hl7.fhir.r4b</artifactId>
-                <version>${fhir-core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>org.hl7.fhir.r5</artifactId>
-                <version>${fhir-core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>org.hl7.fhir.convertors</artifactId>
-                <version>${fhir-core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ca.uhn.hapi.fhir</groupId>
-                <artifactId>org.hl7.fhir.utilities</artifactId>
-                <version>${fhir-core.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>org.hl7.fhir.r4</artifactId>-->
+<!--                <version>${fhir-core.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>org.hl7.fhir.r4b</artifactId>-->
+<!--                <version>${fhir-core.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>org.hl7.fhir.r5</artifactId>-->
+<!--                <version>${fhir-core.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>org.hl7.fhir.convertors</artifactId>-->
+<!--                <version>${fhir-core.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--                <artifactId>org.hl7.fhir.utilities</artifactId>-->
+<!--                <version>${fhir-core.version}</version>-->
+<!--            </dependency>-->
 
             <!-- Java implementation of VS Code language server protocol -->
             <dependency>