diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue
index 43b471e81..2a6119681 100644
--- a/src/common-components/funnel-footer/funnel-footer.vue
+++ b/src/common-components/funnel-footer/funnel-footer.vue
@@ -15,10 +15,6 @@
                     data-bs-target="#footerModal"
                     data-bs-dismiss="modal" />
             </div>
-            <!-- TODO KO DELETE FOR QUOTE MVP -->
-            <div class="col-auto">
-                <button @click="$emit('tempButtonClicked')">Heritage</button>
-            </div>
             <div v-if="!isBackButtonHidden" class="col-auto link-col py-1 text-break">
                 <textLink
                     linkType="navigation"
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index ffef2f6fa..d67f73838 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -174,9 +174,7 @@ export default {
                 ).parts = partFromCapabilityQuestionAnswer;
             }
 
-            // this.navigateForward(partsOrQuestions);
-            // TODO KO delete after quote MVP
-            this.navigateForward(partsOrQuestions, null, this.shouldGoToHeritageQuote);
+            this.navigateForward(partsOrQuestions);
         },
     },
     components: {
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 53a010d72..b89feb5a9 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -158,9 +158,7 @@ export default {
                 ];
             }
 
-            // this.navigateForward(partsOrQuestions);
-            // TODO KO delete after quote MVP
-            this.navigateForward(partsOrQuestions, null, this.shouldGoToHeritageQuote);
+            this.navigateForward(partsOrQuestions);
         },
     },
     components: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 1ebfe02a6..c2acb6ca0 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -35,7 +35,6 @@
                     cmsWidgetName="FunnelFooterWidget"
                     ref="funnelFooter"
                     :isForwardActionDisabled="isForwardActionDisabled"
-                    @tempButtonClicked="() => handleTempButtonClicked(this)"
                     @back-click="navigateBack"
                     @ForwardClicked="forwardButtonAction" />
             </div>
@@ -189,10 +188,8 @@ export default {
                 false
             );
 
-            // TODO KO delete after quote MVP
-            this.navigateForward(matchedParts, null, this.shouldGoToHeritageQuote);
             // Navigate to the next page
-            // this.navigateForward(matchedParts);
+            this.navigateForward(matchedParts);
         },
 
         LoadInitialPartsData() {
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index dbe7a9115..2ccc00910 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -100,7 +100,6 @@
                     cmsWidgetName="FunnelFooterWidget"
                     ref="funnelFooter"
                     :isForwardActionDisabled="!meta.valid"
-                    @tempButtonClicked="() => handleTempButtonClicked(this)"
                     @back-clicked="backButtonAction"
                     @ForwardClicked="forwardButtonAction" />
             </div>
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 61f26475f..8aa3eecfb 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -7,12 +7,6 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 
 export default {
-    data() {
-        // TODO KO DELETE AFTER QUOTE MVP
-        return {
-            shouldGoToHeritageQuote: false,
-        };
-    },
     methods: {
         hasPartQuestions(partsOrQuestions) {
             return partsOrQuestions?.some((pq) => pq.partQuestions?.length > 0);
@@ -353,9 +347,8 @@ export default {
                 }
             }
         },
-        // TODO KO Delete `shouldGoToHeritageQuote`
         // Can't use `this` because navigateForward is also called from vin-pages-mixin
-        async navigateForward(partsOrQuestions, vm, shouldGoToHeritageQuote) {
+        async navigateForward(partsOrQuestions, vm) {
             const self = vm ?? this;
             const currentPage = self.$route.query.fmgPage;
 
@@ -450,13 +443,15 @@ export default {
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
                 const payment = store.getters.payment;
-                shouldGoToHeritageQuote ||
-                (payment.isInsurance && payment.insuranceCoverage.isVerified)
-                    ? navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal })
-                    : self.$router.navigateWithSaving(
-                          self.navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                          self.$route
-                      );
+
+                if (payment.isInsurance && payment.insuranceCoverage.isVerified) {
+                    navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal })
+                } else {
+                    self.$router.navigateWithSaving(
+                        self.navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                        self.$route
+                    );
+                }
             }
         },
         // Can't use `this` because navigateForward is also called from quote
@@ -507,9 +502,5 @@ export default {
 
             self.$router.navigateWithoutSaving(backNavigationScenario, self.$route);
         },
-        // TODO KO delete this after quote mvp
-        async handleTempButtonClicked(vm) {
-            this.shouldGoToHeritageQuote = true;
-        },
     },
 };
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index ca8c66369..47fa05540 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -4,12 +4,6 @@ import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 
 export default {
-    data() {
-        // TODO KO DELETE AFTER QUOTE MVP
-        return {
-            shouldGoToHeritageQuote: false,
-        };
-    },
     methods: {
         async navigateForwardWithSingleCarMatch() {
             // If we have not already saved a session, we need to save one now before the lengthy call to getPartsOrQuestions
@@ -20,17 +14,10 @@ export default {
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
             const partsOrQuestions = result.data.partsOrQuestions;
 
-            // TODO KO delete `this.shouldGoToHeritageQuote`
             vehicleQuestionsMixin.methods.navigateForward(
                 partsOrQuestions,
                 this,
-                this.shouldGoToHeritageQuote
             );
         },
-        // TODO KO delete this after quote mvp
-        async handleTempButtonClicked(vm) {
-            this.shouldGoToHeritageQuote = true;
-            await vm.forwardButtonAction();
-        },
     },
 };
diff --git a/src/store/index.js b/src/store/index.js
index c6bf967ed..2ffdd89ad 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -906,14 +906,14 @@ export const actions = {
         const carId = context.getters.vehicle.carId;
         const isRepair = context.getters.damage.isRepair;
         const numberOfChips = context.getters.damage.numberOfChips;
-        const parentAccountNumber = context.getters.order.accountNumber.toString();
+        const parentAccountNumber = context.getters.order.accountNumber;
         return globalMethods.callHttpClient({
             method: endpoints.GetSupportingItems.method,
             endpoint: endpoints.GetSupportingItems.url,
             payload: {
                 carId: carId,
                 serviceType: isRepair ? "Repair" : "Replace",
-                parentAccountNumber: parentAccountNumber,
+                parentAccountNumber: parentAccountNumber == 0 ? 167132 : parentAccountNumber,
                 parts: glassPartsArray,
                 numberOfRepairChips: isRepair ? numberOfChips : 0,
             },
@@ -1010,7 +1010,7 @@ export const actions = {
                         },
                         isInsurance: order.payment.isInsurance ?? false,
                     },
-                    accountNumber: order.accountNumber?.toString(),
+                    accountNumber: order.accountNumber,
                     providerNumber: "",
                     serviceLocation: {
                         streetAddress: order.serviceLocation.address,