diff --git a/src/global-methods.js b/src/global-methods.js
index 01d0c9488..ba6cec1ec 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -61,7 +61,7 @@ export default {
             const cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO;
             const submittedOrder = baseMixin.methods.getSubmittedOrder();
             const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
-            const order = hasSubmittedOrder ? submittedOrder.order : store.getters.order;
+            const order = hasSubmittedOrder ? submittedOrder : store.getters.order;
             const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass" });
             const headers = {
                 [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings),
diff --git a/src/helpers/pricing-helper.js b/src/helpers/pricing-helper.js
index 4c87b8cf4..fda5b3b9c 100644
--- a/src/helpers/pricing-helper.js
+++ b/src/helpers/pricing-helper.js
@@ -12,7 +12,7 @@ export function getDisplayAmountDue(lineItemsObject, includeTax = true) {
 export function getAmountDue(lineItemsObject, includeTax = true) {
     let amountDue = 0;
     const order = baseMixin?.methods?.hasSubmittedOrder()
-        ? baseMixin?.methods?.getSubmittedOrder().order
+        ? baseMixin?.methods?.getSubmittedOrder()
         : store.getters.order;
 
     if (lineItemsObject?.glassParts) {
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 0aadfdf5c..8e49f298d 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -173,8 +173,8 @@ export default {
         const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_WIPERS,
             {
-                serviceZipCode: submittedOrder.order.serviceLocation.zipCode,
-                carId: submittedOrder.order.vehicle.carId,
+                serviceZipCode: submittedOrder.serviceLocation.zipCode,
+                carId: submittedOrder.vehicle.carId,
             },
             "confirmation"
         );
@@ -203,10 +203,10 @@ export default {
 
         const resultMap = await settleAllPromises(promiseResultMap);
         const availableVaps = [resultMap.rainDefense, ...resultMap.wipers];
-        const lineItemsFromSubmittedOrder = deepClone(submittedOrder.order.lineItems);
+        const lineItemsFromSubmittedOrder = deepClone(submittedOrder.lineItems);
 
-        const isNoComp = submittedOrder?.order?.policy?.isNoComp;
-        const isItac = submittedOrder?.order?.policy?.isItac;
+        const isNoComp = submittedOrder?.policy?.isNoComp;
+        const isItac = submittedOrder?.policy?.isItac;
         const isRecalibrationOnOrder = containsRecalParts(lineItemsFromSubmittedOrder);
 
         const shouldHideRecalibration = () => {
@@ -254,7 +254,7 @@ export default {
             return containsRecalParts(this?.lineItems);
         },
         ShowCart() {
-            if (this.isPia && this.submittedOrder?.order?.settledTenderAmount == 0) {
+            if (this.isPia && this.submittedOrder?.settledTenderAmount == 0) {
                 // settleTenderAmount always shows 0 via localhost or dev.
                 // Temporarily set return true to see cart in localhost or dev environment
                 return false;
@@ -269,13 +269,13 @@ export default {
             return this.getCmsContent("ScheduleConfirmationWidget", "Image");
         },
         CustomerPortalLoginToken() {
-            return this.submittedOrder?.order.customerPortalLoginToken;
+            return this.submittedOrder?.customerPortalLoginToken;
         },
         ConfirmationEmailText() {
             return this.getCmsContent("ConfirmationEmailWidget", "BodyText")
                 ?.replaceAll(
                     "{custom:submittedOrder.customer.emailAddress}",
-                    this.submittedOrder?.order.customer?.emailAddress
+                    this.submittedOrder?.customer?.emailAddress
                 )
                 ?.replaceAll("{custom:MY_ACCOUNT_URL}", applicationConfig.MY_ACCOUNT)
                 ?.replaceAll("{custom:CUSTOMER_PORTAL_LOGIN_TOKEN}", this.CustomerPortalLoginToken)
@@ -283,88 +283,88 @@ export default {
                 ?.replaceAll(">", ">");
         },
         ScheduleDate() {
-            return this.submittedOrder?.order.schedule?.date;
+            return this.submittedOrder?.schedule?.date;
         },
         AppointmentType() {
-            return this.submittedOrder?.order.serviceLocation?.appointmentType;
+            return this.submittedOrder?.serviceLocation?.appointmentType;
         },
         ScheduleStartTime() {
-            return this.submittedOrder?.order.schedule?.startTime;
+            return this.submittedOrder?.schedule?.startTime;
         },
         ScheduleEndTime() {
-            return this.submittedOrder?.order.schedule?.endTime;
+            return this.submittedOrder?.schedule?.endTime;
         },
         InShopWordingText() {
             return this.getCmsContent("InShopWordingWidget", "BodyText")
                 ?.replaceAll(
                     "{custom:submittedOrder.vehicle.year}",
-                    this.submittedOrder?.order?.vehicle?.year
+                    this.submittedOrder?.vehicle?.year
                 )
                 ?.replaceAll(
                     "{custom:submittedOrder.vehicle.make}",
-                    this.submittedOrder?.order?.vehicle?.make
+                    this.submittedOrder?.vehicle?.make
                 )
                 ?.replaceAll(
                     "{custom:submittedOrder.vehicle.model}",
-                    this.submittedOrder?.order?.vehicle?.model
+                    this.submittedOrder?.vehicle?.model
                 );
         },
         MobileWordingText() {
             return this.getCmsContent("MobileWordingWidget", "BodyText")
                 ?.replaceAll(
                     "{custom:submittedOrder.vehicle.year}",
-                    this.submittedOrder?.order?.vehicle?.year
+                    this.submittedOrder?.vehicle?.year
                 )
                 ?.replaceAll(
                     "{custom:submittedOrder.vehicle.make}",
-                    this.submittedOrder?.order?.vehicle?.make
+                    this.submittedOrder?.vehicle?.make
                 )
                 ?.replaceAll(
                     "{custom:submittedOrder.vehicle.model}",
-                    this.submittedOrder?.order?.vehicle?.model
+                    this.submittedOrder?.vehicle?.model
                 );
         },
         DropOffWordingText() {
             return this.getCmsContent("DropOffWordingWidget", "BodyText")
                 ?.replaceAll(
                     "{custom:submittedOrder.vehicle.year}",
-                    this.submittedOrder?.order?.vehicle?.year
+                    this.submittedOrder?.vehicle?.year
                 )
                 ?.replaceAll(
                     "{custom:submittedOrder.vehicle.make}",
-                    this.submittedOrder?.order?.vehicle?.make
+                    this.submittedOrder?.vehicle?.make
                 )
                 ?.replaceAll(
                     "{custom:submittedOrder.vehicle.model}",
-                    this.submittedOrder?.order?.vehicle?.model
+                    this.submittedOrder?.vehicle?.model
                 );
         },
         ServiceLocationAddress() {
-            return this.submittedOrder?.order?.serviceLocation?.address;
+            return this.submittedOrder?.serviceLocation?.address;
         },
         ServiceLocationAddress2() {
-            return this.submittedOrder?.order?.serviceLocation?.address2;
+            return this.submittedOrder?.serviceLocation?.address2;
         },
         ServiceLocationCity() {
-            return this.submittedOrder?.order?.serviceLocation?.city;
+            return this.submittedOrder?.serviceLocation?.city;
         },
         ServiceLocationState() {
-            return this.submittedOrder?.order?.serviceLocation?.state;
+            return this.submittedOrder?.serviceLocation?.state;
         },
         ServiceLocationZipCode() {
-            return this.submittedOrder?.order?.serviceLocation?.zipCode;
+            return this.submittedOrder?.serviceLocation?.zipCode;
         },
         ProviderAddress() {
-            return this.submittedOrder?.order?.serviceLocation?.provider?.address?.streetAddress;
+            return this.submittedOrder?.serviceLocation?.provider?.address?.streetAddress;
         },
         ProviderCity() {
-            return this.submittedOrder?.order?.serviceLocation?.provider?.address?.city;
+            return this.submittedOrder?.serviceLocation?.provider?.address?.city;
         },
         ProviderState() {
-            return this.submittedOrder?.order?.serviceLocation?.provider?.address?.state;
+            return this.submittedOrder?.serviceLocation?.provider?.address?.state;
         },
         ProviderZipCode() {
-            return this.submittedOrder?.order?.serviceLocation?.provider?.address?.zipCode;
+            return this.submittedOrder?.serviceLocation?.provider?.address?.zipCode;
         },
         AppointmentWordingText() {
             if (this.AppointmentType == AppointmentTypeStrings.MOBILE) {
@@ -408,7 +408,7 @@ export default {
             }
             if (this.AppointmentType == AppointmentTypeStrings.DROP_OFF) {
                 if (
-                    this.submittedOrder?.order?.schedule?.routeCode.includes(
+                    this.submittedOrder?.schedule?.routeCode.includes(
                         RouteCodeFlags.OVERNIGHT_DROP_OFF
                     )
                 ) {
@@ -420,22 +420,22 @@ export default {
             return `at ${get12HourTimeFormat(this.ScheduleStartTime)}`;
         },
         vehicleBannerImageUrl() {
-            return this.submittedOrder?.order?.vehicle.imageUrl;
+            return this.submittedOrder?.vehicle.imageUrl;
         },
         damageInfo() {
-            return this.submittedOrder?.order?.damage;
+            return this.submittedOrder?.damage;
         },
         isMSRFeeApplicable() {
-            return this.submittedOrder?.order?.isMSRFeeApplicable;
+            return this.submittedOrder?.isMSRFeeApplicable;
         },
         isInsurance() {
-            return this.submittedOrder?.order?.payment?.isInsurance;
+            return this.submittedOrder?.payment?.isInsurance;
         },
         isNoComp() {
-            return this.submittedOrder?.order?.policy?.isNoComp;
+            return this.submittedOrder?.policy?.isNoComp;
         },
         isItac() {
-            return this.submittedOrder?.order?.policy?.isItac;
+            return this.submittedOrder?.policy?.isItac;
         },
         hasVapsInCart() {
             if (this.lineItems?.vaps?.length > 0) {
@@ -448,28 +448,28 @@ export default {
             if (this.isNoComp || this.isItac) {
                 return coverageStatus.NOCOMP;
             } else {
-                return this.submittedOrder?.order?.payment?.insuranceCoverage?.coverageStatus;
+                return this.submittedOrder?.payment?.insuranceCoverage?.coverageStatus;
             }
         },
         currentDeductible() {
-            return this.submittedOrder?.order?.policy?.currentDeductible;
+            return this.submittedOrder?.policy?.currentDeductible;
         },
         insuranceCompanyName() {
-            return this.submittedOrder?.order?.policy?.insuranceCompanyName;
+            return this.submittedOrder?.policy?.insuranceCompanyName;
         },
         isPia() {
-            return this.submittedOrder?.order?.payment?.isPia;
+            return this.submittedOrder?.payment?.isPia;
         },
         AppointmentDuration() {
-            const durationMaximum = this.submittedOrder?.order?.schedule?.jobMaxMinutes;
-            const durationMinimum = this.submittedOrder?.order?.schedule?.jobMinMinutes;
+            const durationMaximum = this.submittedOrder?.schedule?.jobMaxMinutes;
+            const durationMinimum = this.submittedOrder?.schedule?.jobMinMinutes;
             const durationLengthString = "Duration: ";
             if (
-                this.submittedOrder?.order?.schedule?.routeCode.includes(RouteCodeFlags.ALL_DAY_DROP_OFF)
+                this.submittedOrder?.schedule?.routeCode.includes(RouteCodeFlags.ALL_DAY_DROP_OFF)
             ) {
                 return durationLengthString.concat("All Day");
             } else if (
-                this.submittedOrder?.order?.schedule?.routeCode.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF)
+                this.submittedOrder?.schedule?.routeCode.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF)
             ) {
                 return durationLengthString.concat("Overnight");
             } else {
@@ -541,7 +541,7 @@ export default {
                     parseInt(this.donationAmount),
                     false
                 );
-                this.lineItems = deepClone(this.getSubmittedOrder().order.lineItems);
+                this.lineItems = deepClone(this.getSubmittedOrder().lineItems);
             } else {
                 this.showDonationError = true;
                 this.showDonationSuccess = false;
diff --git a/src/store/index.js b/src/store/index.js
index 05cb572e1..032660c6f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1854,7 +1854,6 @@ export const actions = {
         if (windshieldPartWithRecal) {
             url += `/${windshieldPartWithRecal.partNumber}`;
         }
-        url += "/false";
 
         return globalMethods.callHttpClient({
             method: endpoints.GetProviders.method,
@@ -3264,10 +3263,7 @@ export const actions = {
         }
 
         // create a submitted order object from vuex.
-        const submittedOrder = {
-            order: context.state.order,
-            applicationUser: context.state.applicationUser,
-        };
+        const submittedOrder = context.state.order;
 
         const experiments = context.state.applicationUser.experiments;
         const affiliateCookies = context.state.applicationUser.affiliateCookies;