diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 55feca36f..4edfb8bca 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -39,7 +39,10 @@
                         :isDisabled="footerButtonDisabled"
                         :buttonText="footerButtonText"
                         @click-event="validateAndEmit"
-                        :class="isFooterButtonDisabled && 'form-test-invalid'" />
+                        :class="[
+                        isFooterButtonDisabled && 'form-test-invalid',
+                        { 'form-test-invalid': footerButtonDisabled === true }
+                        ]" />
                 </div>
             </div>
         </div>
@@ -139,9 +142,6 @@ export default {
     },
     computed: {
         isFooterButtonDisabled() {
-            if (this.footerButtonDisabled !== undefined) {
-                return this.footerButtonDisabled;
-            }
             if (!this.meta.touched) {
                 return !this.meta.valid;
             }
diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue
index 9f7507d77..0bc2376c1 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -1,18 +1,10 @@
 <template>
     <transition name="fade" mode="out-in">
         <div v-if="isDisplayed" class="shop-question" aria-live="polite">
-            <alert
-                ref="alertDropoffInformation"
-                v-if="displayDropoffInformation"
-                class="mb-4 drop-off-alert"
-                cmsWidgetName="AlertDropoffInformationWidget"
-                alertClass="alert-info"
-                v-bind:isDismissible="false" />
             <div class="modal-link">
                 <text-link
                     linkType="text"
                     :text="shopQuestionLinkText"
-                    :shopProviderData="shopProviderData"
                     href="#!"
                     @click-event="openModal"></text-link>
             </div>
@@ -27,7 +19,7 @@
         :footerButtonDisabled="
             displayInvalidZipAlert || displayNoShopsAlert || !selectedProviderNumber
         "
-        @footer-button-event="SetZipCodeAndShop">
+        @footer-button-event="setZipCodeAndShop">
         <serviceZipQuestion
             ref="serviceZipQuestion"
             class="shop-question-zipcode"
@@ -47,47 +39,12 @@
             cmsWidgetName="AlertInvalidZipWidget"
             alertClass="alert-danger"
             v-bind:isDismissible="false" />
-        <alert
-            ref="alertMilitaryBaseZip"
-            class="my-5"
-            cmsWidgetName="AlertMilitaryBaseZipWidget"
-            v-if="displayMilitaryZipAlert"
-            alertClass="alert-warning" />
-
-        <alert
-            ref="alertMobileOnly"
-            class="my-5"
-            cmsWidgetName="AlertMobileOnlyWidget"
-            v-if="displayServiceableMobileOnly"
-            alertClass="alert-warning" />
-
-        <alert
-            ref="alertRecalNoMobile"
-            class="my-5"
-            cmsWidgetName="AlertRecalNoMobileWidget"
-            v-if="displayRecalibrationWarning"
-            @text-link-clicked="openModalAction"
-            alertClass="alert-warning" />
-
-        <alert
-            ref="alertInshopOnly"
-            class="my-5"
-            cmsWidgetName="AlertInshopOnlyWidget"
-            v-if="displayServiceableInshopOnly"
-            alertClass="alert-warning" />
-
         <alert
             ref="alertNoShops"
             class="my-5"
             cmsWidgetName="AlertNoShopsWidget"
             v-if="displayNoShopsAlert"
             alertClass="alert-warning" />
-        <alert
-            ref="alertMobileFeeFree"
-            class="my-5"
-            cmsWidgetName="AlertMobileFeeFreeWidget"
-            v-if="showMobileFreeAlert"
-            alertClass="alert-success" />
         <div v-if="!displayInvalidZipAlert">
             <buttonQuestion
                 ref="buttonQuestion"
@@ -153,13 +110,6 @@ import {
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
 
-function getShopsByZip(zipCode, shops, numberToGet = 3) {
-    return shops
-        .filter((shop) => shop.address && shop.address.zipCode && shop.address.zipCode !== "")
-        .sort((a, b) => a.distanceInMiles - b.distanceInMiles)
-        .slice(0, numberToGet);
-}
-
 export default {
     name: "shop-question-popup",
     mixins: [baseMixin],
@@ -496,7 +446,7 @@ export default {
                 this.shopIndex = 3;
             }
 
-            const sortedShops = getShopsByZip(zipCode, this.shopProviders, this.shopIndex);
+            const sortedShops = this.getShopsByZip(zipCode, this.shopProviders, this.shopIndex);
 
             const toTitleCase = (str) => {
                 return str.replace(/\w\S*/g, function (txt) {
@@ -561,7 +511,7 @@ export default {
             this.displayNoServiceAlert = false;
             this.displayNoShopsAlert = false;
         },
-        async SetZipCodeAndShop() {
+        async setZipCodeAndShop() {
             if (
                 this.displayInvalidZipAlert ||
                 this.displayNoShopsAlert ||
@@ -646,6 +596,12 @@ export default {
                 this.closeModal();
             }
         },
+         getShopsByZip(zipCode, shops, numberToGet = 3) {
+            return shops
+                .filter((shop) => shop.address && shop.address.zipCode && shop.address.zipCode !== "")
+                .sort((a, b) => a.distanceInMiles - b.distanceInMiles)
+                .slice(0, numberToGet);
+        }
     },
     watch: {
         shopProviderData: {