diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 890351d8d..56b6c74d6 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -43,7 +43,7 @@
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
 import { Modal } from "bootstrap";
-import { useForm, useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
+import { useForm } from "vee-validate";
 
 export default {
     name: "modal",
@@ -62,18 +62,11 @@ export default {
 
         const { meta, validate, resetForm } = useForm();
 
-        const isFormTouched = useIsFormTouched();
-        const isFormDirty = useIsFormDirty();
-        const isFormValid = useIsFormValid();
-
         return {
             modalId,
             meta,
             validate,
             resetForm,
-            isFormTouched,
-            isFormDirty,
-            isFormValid,
         };
     },
     methods: {
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index afc81261f..153521ea4 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -58,7 +58,6 @@ import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
-import store from "@/store";
 
 // Helpers
 import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
@@ -140,7 +139,6 @@ export default {
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
-
         addressModel: {
             get: function () {
                 return this.modelValue.addressQuestions;
@@ -154,15 +152,12 @@ export default {
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
-
         onModalOpened() {
             this.internalModel = deepClone(this.modelValue);
         },
-
         onModalClosed() {
             this.internalModel = deepClone(this.modelValue);
         },
-
         resetComponent(updatedServiceZipCodeInfo) {
             // Reset the validation form, setting the initial values
             // for the state and zipCode to those that were entered
@@ -195,12 +190,13 @@ export default {
 
                 const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
 
-                // emit it to parent
+                // emit additional data to parent
                 this.$emit("updated-mobile-fee-part", mobileFeePart);
+                this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
-                this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
+
                 this.closeModal();
             }
         },
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 88ed17d21..e94388e06 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -96,49 +96,39 @@ export default {
         resetAlerts() {
             this.displayInvalidZipAlert = false;
         },
-
         resetsOnZipInput() {
             this.resetAlerts();
         },
-
         focusOnZipInput() {
             const input = document.getElementById(this.serviceZipCodeTextInputId);
             input?.focus();
         },
-
         copyModel(modelToCopy) {
             return {
                 state: modelToCopy.state,
                 zipCode: modelToCopy.zipCode,
             };
         },
-
         openModal() {
             this.$refs[this.modalName].openModal();
         },
-
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
-
         resetModalButtonStyle() {
             this.$refs[this.modalName].resetButtonStyle();
         },
-
         onInputIdAssigned(inputId) {
             this.serviceZipCodeTextInputId = inputId;
         },
-
         onModalOpened() {
             this.internalModel.zipCode = this.modelValue.zipCode;
             this.focusOnZipInput();
         },
-
         onModalClosed() {
             this.internalModel.zipCode = this.modelValue.zipCode;
             this.resetsOnZipInput();
         },
-
         async setZipCode() {
             if (this.internalModel.zipCode !== this.modelValue.zipCode) {
                 this.resetAlerts();