diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js
index a592a6d9d..3968248d6 100644
--- a/src/helpers/promotions-helper.js
+++ b/src/helpers/promotions-helper.js
@@ -112,7 +112,6 @@ export async function revalidatePromosAndValidateQueryStringPromo(
             pageNameToLog,
             false
         );
-
         const revalidationErrorPromoCodes = revalidatePromoResponse.errors.map((x) => x.promoCode);
         baseMixin.methods.dispatchStoreAction(
             storeActions.SAVE_ACTIVE_AND_OR_INACTIVE_PROMOS,
@@ -123,7 +122,6 @@ export async function revalidatePromosAndValidateQueryStringPromo(
             false
         );
     }
-
     if (hasNewPromo) {
         validatePromoResponse = await baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.VALIDATE_ORDER_PROMO_AND_SAVE_SERVER_DATA,
@@ -134,7 +132,6 @@ export async function revalidatePromosAndValidateQueryStringPromo(
             pageNameToLog,
             false
         );
-
         if (validatePromoResponse.errorCode == null) {
             // Save promo to store
             const activePromos = store.getters.order.lineItems.promos ?? [];
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 568ef5b20..39541db02 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -112,7 +112,6 @@ import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
-import { partTypeStrings } from "@/constants/part-type-strings";
 import { mapTaxedLineItemsToStoreFormat } from "../../store";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
@@ -381,32 +380,6 @@ export default {
                 );
             }
 
-            // Because we don't yet have a robust solution for part interchange ...
-            // if there are front wiper line items in the revalidate response, we need to delete any existing front wiper line items from the store
-            // and replace them with those that come back from revalidation.
-            const revalidateResponseHasFrontWiperLineItems =
-                revalidatePromoResponse.promoLineItems.find(
-                    (lineItem) => lineItem.partType == partTypeStrings.FRONT_WIPER
-                ).length > 0;
-
-            if (revalidateResponseHasFrontWiperLineItems) {
-                const frontWiperLineItemsInStore = this.lineItems.vaps.find(
-                    (lineItem) => lineItem.partType == partTypeStrings.FRONT_WIPER
-                );
-                if (frontWiperLineItemsInStore.length > 0) {
-                    this.lineItems.vaps = this.lineItems.vaps.find(
-                        (lineItem) => lineItem.partType != partTypeStrings.FRONT_WIPER
-                    );
-                }
-            }
-
-            const vapsToAddToCart = getVapsThatNeedToBeAddedToSatisfyPromos(
-                revalidatePromoResponse.promoLineItems,
-                this.availableVaps,
-                this.lineItems
-            );
-            this.lineItems.vaps.push(...vapsToAddToCart);
-
             this.lineItems.promos = revalidatePromoResponse.promoLineItems;
             this.inactivePromos = revalidatePromoResponse.errors.map((x) =>
                 getPromoCodeWithoutBundleIdentifier(x.promoCode)
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 049ac836f..0d4e22299 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -79,7 +79,7 @@ import vehicleQuestion from "@/layouts/vehicle/vehicle-question/vehicle-question
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { experimentUniverses } from "@/constants/experiments";
-import { getDeviceIdValue, getSessionKeyValue } from "@/helpers/heritage-integration/cookie-helper";
+import { getSessionKeyValue, getUserIdValue } from "@/helpers/heritage-integration/cookie-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
@@ -169,7 +169,7 @@ export default {
             baseMixin.methods.dispatchStoreActionWithLogging(
                 storeActions.LOG_EXPERIMENT_EXPOSURE,
                 {
-                    userId: getDeviceIdValue(),
+                    userId: getUserIdValue(),
                     sessionKey: getSessionKeyValue(),
                     pageName: to.query.fmgPage,
                     experiment: experimentForLogging,
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index d3fa4d0dd..3f20adb59 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -36,6 +36,10 @@ export default {
             const currentPageName = getPageNameByQueryString();
             await this.validateSession();
 
+            const refSequenceNum =
+                store.getters.order.referralSequenceNumber ||
+                store.getters.submittedOrder?.referralSequenceNumber;
+
             var payload = {
                 userId: getUserIdValue(),
                 sessionKey: getSessionKeyValue(),
@@ -45,7 +49,7 @@ export default {
                 event: pageEvent,
                 shouldUseSessionId: false,
                 experimentsForUser: store.getters.applicationUser.experiments,
-                referralSequenceNumber: store.getters.order.referralSequenceNumber,
+                referralSequenceNumber: refSequenceNum,
                 parentAccountNumber: store.getters.order.payment.parentAccountNumber,
             };
 
@@ -56,6 +60,10 @@ export default {
             const currentPageName = getPageNameByQueryString();
             await this.validateSession();
 
+            const refSequenceNum =
+                store.getters.order.referralSequenceNumber ||
+                store.getters.submittedOrder?.referralSequenceNumber;
+
             var payload = {
                 userId: getUserIdValue(),
                 sessionKey: getSessionKeyValue(),
@@ -67,7 +75,7 @@ export default {
                 value: value,
                 shouldUseSessionId: false,
                 experimentsForUser: store.getters.applicationUser.experiments,
-                referralSequenceNumber: store.getters.order.referralSequenceNumber,
+                referralSequenceNumber: refSequenceNum,
                 parentAccountNumber: store.getters.order.payment.parentAccountNumber,
             };