diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 2af4ba6ea..024c1f0e8 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -749,8 +749,12 @@ export default {
         recycleFeeCartItemName() {
             return this.getCmsContent("RecycleFeeTextWidget", "Text");
         },
-        requiresRecycleFeeCartItem() {
-            return !this.isRepair;
+        showRecycleFeeCartItem() {
+            if (!this.isInsurance || this.isItac || this.isNoComp) {  // CASH, ITAC, NOCOMP ORDERS
+                return !this.isRepair;
+            } else {
+                return false;
+            }
         },
         recycleFeeCartItem() {
             let cartItem = null;
@@ -759,7 +763,7 @@ export default {
                 (supportingItem) => supportingItem.partType == partTypeStrings.REPLACE_FEE
             );
 
-            if (!recycleFeeLineItem && this.requiresRecycleFeeCartItem) {
+            if (!recycleFeeLineItem && this.showRecycleFeeCartItem) {
                 recycleFeeLineItem = {
                     partNumber: partTypeStrings.RECYCLE_FEE,
                     partType: partTypeStrings.REPLACE_FEE,
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index d2dde2e05..b5c934448 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -112,6 +112,8 @@ import { containsRecalParts } from "@/helpers/recal-helper.js";
 export default {
     name: "confirmation",
     async beforeRouteEnter(to, from, next) {
+        const hasRecalPriceRemoveExperiment = await store.getters.shouldHideRecalibration;
+
         await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER); // This nulls the Store order
 
         // Call APIs
@@ -156,10 +158,6 @@ export default {
         const isNoComp = submittedOrder?.policy?.isNoComp;
         const isItac = submittedOrder?.policy?.isItac;
         const isRecalibrationOnOrder = containsRecalParts(lineItemsFromSubmittedOrder);
-        const hasRecalPriceRemoveExperiment =
-            experimentMixin.methods
-                .getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)
-                ?.toLowerCase() === "true";
 
         const shouldHideRecalibration = () => {
             if (isNoComp || isItac) {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index d8d4518f1..ff7e457e4 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -47,7 +47,7 @@
                             v-bind:isDismissible="false" />
                     </div>
 
-                    <div v-if="!isInsurance" class="questions-about-service my-5">
+                    <div v-if="isRecalibrationOnOrder && shouldHideRecalibration" class="questions-about-service my-5">
                         <textBlock
                             cmsWidgetName="QuestionsAboutYourServiceWidget"
                             justifyText="left"
@@ -55,8 +55,7 @@
                         <textBlock cmsWidgetName="CallOrTextWidget" justifyText="left" />
                         <hr class="my-5" />
                         <div
-                            class="d-flex flex-row checkbox-group"
-                            v-if="isRecalibrationOnOrder && shouldHideRecalibration">
+                            class="d-flex flex-row checkbox-group">
                             <checkboxQuestion
                                 cmsWidgetName="RecalConfirmWidget"
                                 class="mb-5"
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 732e23ba9..7cce1c120 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -436,7 +436,6 @@ export default {
                 policy.policyNumber !== "";
 
             const skipVin = await skipVinLookup();
-
             if (vehicleChangedDuringPolicyLookupInHeritage) {
                 if (skipVin) {
                     this.$router.navigateWithSaving(
@@ -455,13 +454,22 @@ export default {
                             { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
                         );
                     } else {
-                        this.$router.navigateWithSaving(
-                            this.navigationScenarios
-                                .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
-                            this.$route,
-                            {},
-                            { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
-                        );
+                        if (store.getters.vehicle.vin) {
+                            this.$router.navigateWithSaving(
+                                this.navigationScenarios
+                                    .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
+                                this.$route,
+                                {},
+                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                            );
+                        } else {
+                            this.$router.navigateWithSaving(
+                                this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+                                this.$route,
+                                {},
+                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                            );
+                        }
                     }
                 }
             }