diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 1b9640ad..8f21cdd9 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -68,7 +68,6 @@ const endpoints = Object.freeze({
         url: `${PARTS_BASE_URL}/parts`,
         method: 'POST'
     },
-    // TODO finish
     GetInsurancePriceOrderItems: {
         url: `${PRICE_BASE_URL}/order-items-with-insurance-pricing`,
         method: 'GET'
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index d7290ae0..6f8a6010 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -23,8 +23,7 @@
                     :showAsPaid="false"
                     :amountDueLabel="amountDueText"
                     :deductibleLabel="deductibleLabel"
-                    :basePriceLabel="basePriceLabel"
-                    :baseServiceLineItems="baseServiceLineItems" />
+                    :basePriceLabel="basePriceLabel" />
                 <hr class="mt-0 mb-5" />
                 <div>Pia Alert Placeholder</div>
                 <paymentMethodQuestion
@@ -105,23 +104,8 @@ export default {
         });
     },
     data() {
-        const { supportingItems, glassParts, otherParts } = useMainStore().lineItems;
-        const baseServiceLineItems = [
-            ...(supportingItems ?? []),
-            ...(glassParts ?? []),
-            ...(otherParts ?? [])
-        ];
         return {
             paymentMethodInternalModel: this.getPaymentMethodFromStore(),
-            // TODO set line items
-            // baseServiceLineItems: [
-            //     {
-            //         kitPrice: 1,
-            //         laborAmount: 2,
-            //         sellingPrice: 3
-            //     }
-            // ],
-            baseServiceLineItems,
             rules: {
                 optionRequired: globalRules.OPTION_REQUIRED
             },
@@ -133,9 +117,6 @@ export default {
         };
     },
     computed: {
-        damageInfo() {
-            return useMainStore().order.damage;
-        },
         customCallToActionButtonCopy() {
             switch (this.paymentMethod) {
                 case paymentMethods.CREDIT_CARD:
@@ -173,16 +154,16 @@ export default {
             const vehicleReqs = !!(vehicle.year && vehicle.make && vehicle.model && vehicle.style);
 
             // Damage
-            const { damage } = useMainStore().order;
+            const { isRepair, numberOfChips, glassToReplace } = useMainStore().order.damage;
             const damageReqs = !!(
-                (damage.isRepair && damage.numberOfChips)
-                || (!damage.isRepair && damage.glassToReplace?.length)
+                (isRepair && numberOfChips)
+                || (!isRepair && glassToReplace?.length)
             );
 
             // Service Package
             const { lineItems } = useMainStore().order;
             const packageReqs = !!(
-                (damage.isRepair || lineItems.glassParts)
+                (isRepair || lineItems.glassParts)
                 && lineItems.supportingItems
             );
 
@@ -209,22 +190,22 @@ export default {
                 (isMobile && mobileReqs) || (!isMobile && dropOffInshopReqs);
 
             // Schedule
-            const { schedule } = useMainStore().order;
+            const { date, startTime, endTime, jobMaxMinutes, jobMinMinutes } = useMainStore().order.schedule;
             const scheduleReqs = !!(
-                schedule.date
-                && schedule.startTime
-                && schedule.endTime
-                && schedule.jobMaxMinutes
-                && schedule.jobMinMinutes
+                date
+                && startTime
+                && endTime
+                && jobMaxMinutes
+                && jobMinMinutes
             );
 
             // Customer
-            const { customer } = useMainStore().order;
+            const { firstName, lastName, phoneNumber, emailAddress } = useMainStore().order.customer;
             const customerReqs = !!(
-                customer.firstName
-                && customer.lastName
-                && customer.phoneNumber
-                && customer.emailAddress
+                firstName
+                && lastName
+                && phoneNumber
+                && emailAddress
             );
 
             return (