diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 56c18da12..c1924d463 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -105,7 +105,7 @@
                             class="ps-4 pe-4 mt-4" />
                     </div>
                     <shopQuestionPopup
-                        modalWidgetName="ShopQuestionPopupWidget"
+                        v-if="isShopQuestionDisplayed"
                         :appointmentType="appointmentType"
                         :modelValue="{
                             zipCode: zipCode,
@@ -113,7 +113,6 @@
                         }"
                         :preSelectedProviderNumber="selectedProvider?.providerNumber"
                         :shopProviderData="shopProviderData"
-                        :isServiceableInshop="isServiceableInshop"
                         @updated-serviceability="setServiceabilityDetails"
                         @shop-selected="onShopSelected"
                         @update:modelValue="onShopModelUpdated"
@@ -121,7 +120,6 @@
                         @update-shop-provider-data="shopProviderData = $event"
                         @updated-contains-military-base="setContainsMilitaryBase"
                         :zipCode="zipCode"
-                        :isDisplayed="isShopQuestionDisplayed"
                         cmsWidgetName="YourSafeliteShopWidget" />
 
                     <contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" />
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 aa68dd8fc..6fa7199c4 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -1,6 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
-        <div v-if="isDisplayed" class="shop-question" aria-live="polite">
+        <div class="shop-question" aria-live="polite">
             <div class="modal-link">
                 <text-link
                     linkType="text"
@@ -84,7 +84,6 @@ import serviceZipQuestion from "@/layouts/service-location/service-zip-modal-que
 import buttonQuestion from "@/digital-components/button-question/button-question.vue";
 import alert from "@/ux-components/alert/alert.vue";
 import shopListButton from "./shop-list-button/shop-list-button";
-import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 
 // Supporting files
 import { defineRule } from "vee-validate";
@@ -106,32 +105,26 @@ import {
     getBillToAccountNumber,
     getClosestApplicableShops,
     getShopProviderData,
-    getZipCodeData,
 } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
-defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
 
 export default {
     name: "shop-question-popup",
     mixins: [baseMixin],
     data() {
         return {
-            isShopQuestionDisplayed: true,
             internalModel: this.copyModel(this.modelValue),
             answers: [],
             shopListButton: shopListButton,
             shopIndex: 0,
-            displaySeeMoreLocationsLink: false,
             serviceZipCodeTextInputId: "",
             localShopProviderData: this.shopProviderData,
             selectedProviderNumber: null,
             isLoadingShops: false,
             lastSearchedZip: "",
             lastSuccessfulZip: "",
-            hasLoadedShopData: false,
             displayInvalidZipAlert: false,
-            areShopsAvialable: true,
             displayNoShopsAlert: false,
         };
     },
@@ -145,15 +138,6 @@ export default {
                 zipCode: "",
             }),
         },
-        isDisplayed: Boolean,
-        modelWidgetName: {
-            type: String,
-            required: true,
-        },
-        isServiceableInshop: {
-            type: Boolean,
-            default: false,
-        },
         zipCode: {
             type: String,
             default: "",
@@ -167,24 +151,18 @@ export default {
         shopQuestionLinkText() {
             return this.getCmsContent("ChangeMyLocationLinkWidget", "Text");
         },
-        modalName() {
-            return this.modelWidgetName;
-        },
         modalHeaderText() {
             return this.getCmsContent("ShopQuestionWidget", "QuestionText");
         },
-        selectShopText() {
-            return this.getCmsContent("YourSafeliteShopWidget", "QuestionText");
-        },
-        modal() {
-            return this.$refs.shopQuestionModal;
-        },
         shopProviders() {
             return this.localShopProviderData?.shopProviders ?? [];
         },
         modalFooterText() {
             return this.getCmsContent("SaveLocationWidget", "Text");
         },
+        modal() {
+            return this.$refs.shopQuestionModal;
+        },
         selectedValue: {
             get: function () {
                 return this.modelValue;
@@ -206,6 +184,11 @@ export default {
                 shopAppointmentType: this.appointmentType,
             };
         },
+        displaySeeMoreLocationsLink() {
+            if (!this.shopProviders.length)
+                return false;
+            return this.shopIndex < this.shopProviders.length;
+        },
         showMoreShopsLinkText() {
             return this.getCmsContent("ShowMoreShopsLinkWidget", "Text");
         },
@@ -223,13 +206,6 @@ export default {
             }
             this.$refs.shopQuestionModal.openModal();
         },
-        getSelectedProviderObject(providerNumber) {
-            const provider =
-                this.shopProviders?.find((provider) => provider.providerNumber == providerNumber) ??
-                new Provider();
-
-            return provider;
-        },
         async getNextShopsFromList(numberToGet = 3) {
             const logFirstShopsDisplayed = this.shopIndex == 0;
 
@@ -303,35 +279,14 @@ export default {
 
             await nextTick();
 
-            if (this.shopIndex == this.shopProviders.length) {
-                this.displaySeeMoreLocationsLink = false;
-            } else {
-                this.displaySeeMoreLocationsLink = true;
-            }
-
-            await nextTick();
-
             this.scrollToPageBottom();
         },
-        async handleUpdate(selectedShopIndex = null) {
-            this.resetAnswers();
-            if (selectedShopIndex >= 3) {
-                await this.getNextShopsFromList(selectedShopIndex + 1);
-            } else {
-                await this.getNextShopsFromList();
-                await nextTick();
-            }
-        },
         copyModel(modelToCopy) {
             return {
                 state: modelToCopy.state,
                 zipCode: modelToCopy.zipCode,
             };
         },
-        resetAnswers() {
-            this.answers = [];
-            this.shopIndex = 0;
-        },
         onModalOpened() {
             const preSelectedIndex = this.shopProviders.findIndex(
                 (provider) => provider.providerNumber == this.preSelectedProviderNumber
@@ -419,7 +374,7 @@ export default {
                 }
             }
         },
-        async updateShopsForZip(zipCode) {
+        updateShopsForZip(zipCode) {
             if (!this.appointmentType) {
                 this.answers = [];
                 this.isLoadingShops = false;
@@ -492,7 +447,6 @@ export default {
                 this.selectedProviderNumber = null;
             }
             this.shopIndex = mappedData.length;
-            this.displaySeeMoreLocationsLink = this.shopIndex < this.shopProviders.length;
             if (mappedData.length > 0) {
                 this.lastSuccessfulZip = zipCode;
             }
@@ -613,7 +567,6 @@ export default {
             immediate: true,
             handler(newVal) {
                 this.localShopProviderData = newVal;
-                this.hasLoadedShopData = true;
             },
         },
     },