diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index bcd6303bd..b738ac6ae 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -196,5 +196,4 @@ describe("modal.vue", () => {
         // Assert
         expect(hideMock).toHaveBeenCalled();
     });
-
 });
diff --git a/src/digital-components/text-block/text-block.spec.js b/src/digital-components/text-block/text-block.spec.js
index 170a91876..89b2fdf36 100644
--- a/src/digital-components/text-block/text-block.spec.js
+++ b/src/digital-components/text-block/text-block.spec.js
@@ -15,8 +15,8 @@ describe("modal.vue", () => {
         const wrapper = shallowMount(TextBlock, {
             mixins: [mockMixin],
             props: {
-                customText: "customText"
-            }
+                customText: "customText",
+            },
         });
 
         expect(wrapper.html()).toEqual(expect.stringContaining("customText"));
@@ -48,7 +48,6 @@ describe("modal.vue", () => {
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockProps["fontWeight"]));
     });
-    
 });
 
 ///////////////
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6406519dd..1e9dc6597 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -8,9 +8,7 @@
                 v-model="serviceZipCodeQuestion"
                 @service-zip-updated="resetMobileLocation"
                 linkWidgetName="ServiceZipLinkWidget"
-                modalWidgetName="ServiceZipModalWidget"
-                textboxQuestionWidgetName="ServiceZipQuestionWidget"
-                alertInvalidZipWidgetName="AlertInvalidZipWidget" />
+                modalWidgetName="ServiceZipModalWidget" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 ref="mobileLocationModalQuestions"
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index 4a0dec045..3c2384944 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -17,7 +17,6 @@ jest.mock("@/digital-components/modal/modal", () => ({
 
 const linkWidgetName = "linkWidgetName";
 const modalWidgetName = "modalWidgetName";
-const textboxQuestionWidgetName = "textboxQuestionWidgetName";
 
 const mockLinkCmsContent = {
     BodyText: "Sample link body text here.",
@@ -27,10 +26,6 @@ const mockModalCmsContent = {
     FooterText: "Sample modal footer text here.",
 };
 
-const mockTextboxQuestionCmsContent = {
-    QuestionText: "Sample question text here.",
-};
-
 const mockMixin = {
     methods: {
         getCmsContent: jest.fn((widgetName, cmsFieldName) => {
@@ -42,10 +37,6 @@ const mockMixin = {
                 return mockModalCmsContent[cmsFieldName];
             }
 
-            if (widgetName === textboxQuestionWidgetName) {
-                return mockTextboxQuestionCmsContent[cmsFieldName];
-            }
-
             return null;
         }),
 
@@ -96,7 +87,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -119,7 +109,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -144,7 +133,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -175,7 +163,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -204,7 +191,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -233,7 +219,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -262,7 +247,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -291,7 +275,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -321,7 +304,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
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 ef8e00c1d..271c69930 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
@@ -59,10 +59,14 @@ export default {
         },
         linkWidgetName: String,
         modalWidgetName: String,
-        textboxQuestionWidgetName: String,
-        alertInvalidZipWidgetName: String,
     },
     computed: {
+        textboxQuestionWidgetName() {
+            return "ServiceZipQuestionWidget";
+        },
+        alertInvalidZipWidgetName() {
+            return "AlertInvalidZipWidget";
+        },
         serviceZipLinkText() {
             if (this.modelValue.zipCode && this.modelValue.zipCode.length > 0) {
                 return this.modelValue.state + ", " + this.modelValue.zipCode;
@@ -111,9 +115,6 @@ export default {
 
         onInputIdAssigned(inputId) {
             this.serviceZipCodeTextInputId = inputId;
-
-            // bubble up the event to the parent
-            this.$emit("textboxQuestionEvent.inputIdAssigned", inputId);
         },
 
         onModalOpened() {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
index d6b861a75..b51ecc9d3 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
@@ -14,7 +14,7 @@ describe("service-zip-question.vue", () => {
 
         // Act
         const modelValueText = wrapper.vm.value;
-        wrapper.vm.value = "test also"
+        wrapper.vm.value = "test also";
 
         // Assert
         expect(modelValueText).toEqual("test");
@@ -32,10 +32,9 @@ describe("service-zip-question.vue", () => {
 
         // Act
         const modelValueText = wrapper.vm.value;
-        wrapper.vm.value = "test also"
+        wrapper.vm.value = "test also";
 
         // Assert
         expect(wrapper.emitted("update:modelValue")).toEqual([["test also"]]);
-    })
-    
+    });
 });