diff --git a/src/iss-components/cart-dropdown/cart-dropdown.spec.js b/src/iss-components/cart-dropdown/cart-dropdown.spec.js
index 607c8f28..07097edf 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.spec.js
+++ b/src/iss-components/cart-dropdown/cart-dropdown.spec.js
@@ -1377,7 +1377,9 @@ describe('cart-dropdown component', () => {
             });
         });
         describe.todo('removeItem', () => {
-            test('when isVap false, updateVaps not called', () => {});
+            test('when isVap false, updateVaps not called', () => {
+
+            });
             test('when isVap true, vapsInOrder is expected', () => {});
             test('when isVap true and vapsInOrder null, vapsInOrder becomes []', () => {});
         });
diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue
index 66f10dcc..912b0147 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.vue
+++ b/src/iss-components/cart-dropdown/cart-dropdown.vue
@@ -93,18 +93,16 @@
                             <span v-else>{{ item?.name ?? '' }}</span>
                             <span>{{ getDisplayed(item?.subTotal ?? 0, false) }}</span>
                         </div>
-                        <div class="px-5">
-                            <textLink
-                                v-if="item.isRemovable && (!readOnly || !showAsPaid)"
-                                linkType="text"
-                                text="Remove"
-                                href="javascript:void(0)"
-                                @clickEvent="removeItem(item.partType, item.isVap)">
-                                <template #after-text>
-                                    <span class="sr-only">{{ item?.name ?? '' }}</span>
-                                </template>
-                            </textLink>
-                        </div>
+                        <textLink
+                            v-if="item.isRemovable && (!readOnly || !showAsPaid)"
+                            linkType="text"
+                            text="Remove"
+                            href="javascript:void(0)"
+                            @clickEvent="removeItem(item.partType, item.isVap)">
+                            <template #after-text>
+                                <span class="sr-only">{{ item?.name ?? '' }}</span>
+                            </template>
+                        </textLink>
                     </div>
                 </div>
                 <div
@@ -268,11 +266,20 @@ export default {
             return items;
         },
         nonServicePackageCartItems() {
-            const vapsLineItemsNotInPackage = this.vapsInOrder
-                ?.filter((vap) => !this.partTypesInServicePackage.includes(vap.partType))
+            const partTypesInOrder = this.vapsInOrder.reduce(
+                (accumulator, vap) => {
+                    if (!accumulator.includes(vap.partType)) {
+                        accumulator.push(vap.partType);
+                    }
+                    return accumulator;
+                },
+                []
+            );
+            const partTypesInOrderButNotPackage = partTypesInOrder
+                .filter((partType) => !this.partTypesInServicePackage.includes(partType))
                 ?? [];
-            const vapsCartItemsNotInPackage = vapsLineItemsNotInPackage.map((lineItem) => {
-                switch (lineItem.partType) {
+            const vapsCartItemsNotInPackage = partTypesInOrderButNotPackage.map((partType) => {
+                switch (partType) {
                     case partTypeStrings.FRONT_WIPER:
                         return this.frontWipersCartItem;
                     case partTypeStrings.REAR_WIPER: