diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index 9b999991a..3dfc82947 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -6,7 +6,7 @@
             :for="inputId"
             :aria-label="questionText"
             class="form-label"
-            v-html="labelText"></label>
+            v-html="questionText"></label>
         <select
             v-model="selectedOption"
             class="form-select"
@@ -35,14 +35,13 @@ export default {
     name: "dropdown-question",
     props: {
         modelValue: String,
-        //inputId: String,
+        customInputId: String,
         options: {
             type: Object,
             required: true,
         },
         isDisabled: Boolean,
         isRequired: Boolean,
-        disableAutoFill: Boolean,
         validationRules: String,
         cmsWidgetName: String,
         hasError: Boolean,
@@ -99,30 +98,6 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
-        labelText: {
-            get: function () {
-                const noBreakChar = "&NoBreak;";
-                var questionText = "";
-                if (this.disableAutoFill) {
-                    var words = this.questionText.toString().split(/[ ]+/);
-                    words.forEach(function (word) {
-                        const position = 1;
-                        word = [
-                            word.toString().slice(0, position),
-                            noBreakChar,
-                            word.toString().slice(position),
-                        ].join("");
-                        questionText += `${word} `;
-                    });
-
-                    questionText = questionText.trimEnd();
-                } else {
-                    questionText = this.questionText.toString();
-                }
-
-                return questionText;
-            },
-        },
     },
     watch: {
         selectedOption(newValue) {
diff --git a/src/digital-components/textbox-question/textbox-question.spec.js b/src/digital-components/textbox-question/textbox-question.spec.js
index d5d1de4e6..694142fb9 100644
--- a/src/digital-components/textbox-question/textbox-question.spec.js
+++ b/src/digital-components/textbox-question/textbox-question.spec.js
@@ -73,24 +73,6 @@ describe("textboxQuestion.vue", () => {
         expect(paragraph.attributes("class")).toContain("form-control");
     });
 
-    it("Should render the 'questionText' data value as the label text when disableAutoFill is false.", async () => {
-        // Arrange
-        const wrapper = shallowMount(textboxQuestion, {
-            global: {
-                directives: {
-                    maska: maska,
-                },
-            },
-            mixins: [mockMixin],
-        });
-
-        // Act
-        const label = wrapper.find("label");
-
-        // Assert
-        expect(label.text()).toContain(questionText);
-    });
-
     it("Should return input id as the id of the input field", async () => {
         // Arrange
         const wrapper = shallowMount(textboxQuestion, {
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 37ef5dac8..a294a8967 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -26,7 +26,6 @@
                     iconRight ? 'icon-right' : '',
                     cornerStyle === 'rounded' ? 'rounded-pill' : '',
                 ]"
-                :autocomplete="preventAutoFill && 'do-not-autofill'"
                 :validationRules="validationRules"
                 @change="handleChange"
                 @blur="handleChange"
@@ -42,7 +41,6 @@
 
 <script>
 import { useField, validate } from "vee-validate";
-import { storeActions } from "@/constants/store-actions";
 
 export default {
     name: "textbox-question",
@@ -70,14 +68,12 @@ export default {
             type: String,
             default: "",
         },
-        handleOnInput: Boolean,
         validationRules: String,
         cmsWidgetName: String,
         maxLength: String,
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
-        preventAutoFill: Boolean,
     },
     setup(props) {
         const inputId = !props.customInputId ? `input-${crypto.randomUUID()}` : props.customInputId;
@@ -129,30 +125,6 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
-        labelText: {
-            get: function () {
-                const noBreakChar = "&NoBreak;";
-                var questionText = "";
-                if (this.disableAutoFill) {
-                    var words = this.questionText.toString().split(/[ ]+/);
-                    words.forEach(function (word) {
-                        const position = 1;
-                        word = [
-                            word.toString().slice(0, position),
-                            noBreakChar,
-                            word.toString().slice(position),
-                        ].join("");
-                        questionText += `${word} `;
-                    });
-
-                    questionText = questionText.trimEnd();
-                } else {
-                    questionText = this.questionText.toString();
-                }
-
-                return questionText;
-            },
-        },
     },
     watch: {
         async value(newValue) {
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index a841449d8..8a28ea669 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -11,7 +11,6 @@
                     placeholderText="Search"
                     aria-haspopup=""
                     hasIcon
-                    disableAutoFill
                     validationRules="street-address-required"
                     @keydown.enter.prevent />
             </div>
@@ -56,7 +55,6 @@
                         v-model="addressModel.zipCode"
                         ref="zipCode"
                         mask="#####"
-                        disableAutoFill
                         validationRules="zip-code-required|zip-code-format" />
                 </div>
             </div>
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index cfc121731..325f8c380 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -7,7 +7,6 @@
                 v-model="customerModel.firstName"
                 ref="firstName"
                 inputId="08497a2efd9a4a73a70360ab47b4838d"
-                disableAutoFill
                 validationRules="first-name-required" />
         </div>
     </div>
@@ -18,7 +17,6 @@
                 v-model="customerModel.lastName"
                 ref="lastName"
                 inputId="0030e56a57e74a4ab92de7fb8e97fec5"
-                disableAutoFill
                 validationRules="last-name-required" />
         </div>
     </div>
@@ -29,7 +27,6 @@
                 v-model="customerModel.emailAddress"
                 ref="emailAddress"
                 inputId="00450a91b8964a768ce3992e6feb890f"
-                disableAutoFill
                 validationRules="email-address-required|email-address-format" />
         </div>
     </div>
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 36a52a2ff..e92fae541 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -34,7 +34,6 @@
                                 inputId="serviceZipCode"
                                 mask="#####"
                                 isRequired
-                                disableAutoFill
                                 validationRules="zip-required|zip-format" />
                         </div>
                     </div>
@@ -45,7 +44,6 @@
                                 v-model="emailAddress"
                                 inputId="emailAddress"
                                 isRequired
-                                disableAutoFill
                                 validationRules="email-address-required|email-address-format" />
                         </div>
                     </div>
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 7353fe0b3..8a46879c0 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
@@ -43,7 +43,6 @@ 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 textBlock from "@/digital-components/text-block/text-block";
-import { useForm } from "vee-validate";
 
 export default {
     name: "mobile-location-modal-questions",
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f50359b53..a193f3dd5 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -45,12 +45,8 @@ export default {
     name: "service-location",
     data() {
         return {
-            // serviceState: "",
-            // serviceZipCode: "",
-            // isServiceable: null,
-            // isVehicleProtected: null,
-            // isZipServiceableMobile: null,
-            // isZipServiceableInShop: null,
+            isZipServiceableMobile: null,
+            isZipServiceableInShop: null,
             serviceZipCodeQuestion: {
                 state: "",
                 zipCode: "",
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 b80f6107f..27e3b91a6 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
@@ -127,7 +127,7 @@ export default {
 
                 // Notify the page that the service zip has been updated to clear Mobile Location form
                 this.$emit("service-zip-updated");
-   
+
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
index fb5b7be7e..979094523 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
@@ -5,7 +5,7 @@
         v-model="value"
         inputId="serviceZipCode"
         questionAlignment="center"
-        mask="#####"       
+        mask="#####"
         :displayQuestionText="false"
         isRequired
         validationRules="zip-required|zip-format" />
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 75d7b019f..0bb30fbfd 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -15,7 +15,6 @@
                             v-model="vin"
                             inputId="vin"
                             isRequired
-                            disableAutoFill
                             validationRules="vin-required|vin-format"
                             :isDisabled="vinPopulatedOnPageLoad"
                             maxLength="17"
@@ -35,7 +34,6 @@
                             inputId="serviceZipCode"
                             mask="#####"
                             isRequired
-                            disableAutoFill
                             validationRules="zip-required|zip-format" />
                     </div>
                 </div>
@@ -46,7 +44,6 @@
                             v-model="emailAddress"
                             inputId="emailAddress"
                             isRequired
-                            disableAutoFill
                             validationRules="email-address-required|email-address-format" />
                     </div>
                 </div>