diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 52a7da34e..87fa9e26b 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -11,8 +11,6 @@
         </legend>
         <div :class="getComponentLoopWrapperClasses">
           <div :class="getComponentWrapperClasses" v-for="answer in answers" :key="answer.Name ? answer.Name : answer">
-            BQ: {{ getValues(answer) }}
-            BQ MV: {{ modelValue }}
             <component
               :is="buttonType"
               @isCheckedChanged="handleCheckedChanged"
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index fd2d9964a..160952ae7 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -134,7 +134,7 @@ describe("vehicle-damage.vue", () => {
       wrapper.vm.selectedWindshieldOptions = {
         selectedWindshieldChipCount: null,
         selectedWindshieldReplaceOptions: ["Single"],
-        selectedWindshieldDamageType: ["Replace"]
+        selectedWindshieldDamageType: "Replace"
       };
 
       wrapper.vm.sideDoorOptionsData = {
@@ -234,7 +234,7 @@ describe("vehicle-damage.vue", () => {
       wrapper.vm.selectedWindshieldOptions = {
         selectedWindshieldChipCount: null,
         selectedWindshieldReplaceOptions: ["Single"],
-        selectedWindshieldDamageType: ["Replace"]
+        selectedWindshieldDamageType: "Replace"
       };
 
       const expectedGlassToReplace = [{ glassLocation: "Windshield", glassName: "Single" },];
@@ -378,7 +378,7 @@ describe("vehicle-damage.vue", () => {
       );
 
       wrapper.vm.selectedDamageLocations = ["Windshield"];
-      wrapper.vm.selectedWindshieldOptions = { selectedWindshieldDamageType: ["Repair"] };
+      wrapper.vm.selectedWindshieldOptions = { selectedWindshieldDamageType: "Repair" };
 
       //Assert
       expect(wrapper.vm.isWindshieldRepair).toEqual(true);
@@ -398,7 +398,7 @@ describe("vehicle-damage.vue", () => {
       );
 
       wrapper.vm.selectedDamageLocations = ["SideDoor"];
-      wrapper.vm.selectedWindshieldOptions = { selectedWindshieldDamageType: ["Repair"] };
+      wrapper.vm.selectedWindshieldOptions = { selectedWindshieldDamageType: "Repair" };
 
       //Assert
       expect(wrapper.vm.isWindshieldRepair).toEqual(false);
@@ -540,19 +540,19 @@ describe("vehicle-damage.vue", () => {
     });
 
     const storeWindshieldOptions = [[1, false, "Windshield", "Single", {
-      selectedWindshieldDamageType: [damageLocationsSelected.REPLACE],
+      selectedWindshieldDamageType: damageLocationsSelected.REPLACE,
       selectedWindshieldChipCount: [], selectedWindshieldReplaceOptions: [damageLocationsSelected.SINGLE]
     }],
     [2, false, "Windshield", "Driver", {
-      selectedWindshieldDamageType: [damageLocationsSelected.REPLACE],
+      selectedWindshieldDamageType: damageLocationsSelected.REPLACE,
       selectedWindshieldChipCount: [], selectedWindshieldReplaceOptions: [damageLocationsSelected.DRIVER]
     }],
     [3, false, "Windshield", "Passenger", {
-      selectedWindshieldDamageType: [damageLocationsSelected.REPLACE],
+      selectedWindshieldDamageType: damageLocationsSelected.REPLACE,
       selectedWindshieldChipCount: [], selectedWindshieldReplaceOptions: [damageLocationsSelected.PASSENGER]
     }],
     [4, true, "", "", {
-      selectedWindshieldDamageType: [damageLocationsSelected.REPAIR],
+      selectedWindshieldDamageType: damageLocationsSelected.REPAIR,
       selectedWindshieldChipCount: [2], selectedWindshieldReplaceOptions: []
     }]
     ];
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 419220dcb..4ca7a49b8 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -5,7 +5,6 @@
       ref="theForm"
       v-slot="{ meta }"
     >
-    {{ selectedDamageLocations }}
       <div class="page-container-grouped-styles">
         <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
         <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index 4d390e1f2..89e5a4b83 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -1,7 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
         <div class="windshield-damage-type-question" v-if="isAvailable" aria-live="polite">
-            WDTQ: {{ modelValue }}
             <buttonQuestion
                 :questionText="questionText"
                 :answers="answersFromCms"
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index 118ee26ff..4d799d0cb 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -1,6 +1,5 @@
 <template>
     <div class="windshield-options">
-        {{ windshieldDamageTypeQuestionValidationRules }}
         <windshieldDamageTypeQuestion cmsWidgetName="WindshieldDamageTypeQuestion"
             :isAvailable=isWindshieldDamageLocation
             :suppressError="hasRepairReplaceConflict || showNoReplacementAvailableError"
@@ -15,10 +14,6 @@
             alertClass="alert-danger"
             :isDismissible="false"
           />
-          WO:<br>
-          <!-- {{ isRepairOptionSelected }}<br>
-          {{ isReplaceOptionSelected }}<br> -->
-          {{ selectedWindshieldDamageTypeValues }}<br>
         <windshieldChipCountQuestion cmsWidgetName="WindshieldChipCountQuestion"
             :isAvailable="isRepairOptionSelected && !hasRepairReplaceConflict"
             groupName="WindshieldChipCountQuestion"
@@ -61,25 +56,6 @@ defineRule("windshield-damage-type-required", required(errorMessages.WINDSHIELD_
 defineRule("windshield-chip-count-required", required(errorMessages.WINDSHIELD_CHIP_COUNT_REQUIRED));
 defineRule("windshield-replace-options-required", required(errorMessages.WINSHIELD_REPLACE_OPTIONS_REQUIRED));
 
-defineRule("check-for-repair-and-replace", (value, [otherFieldValue]) => {
-    console.log(value)
-    console.log(otherFieldValue)
-    console.log(value.toString().toUpperCase().includes(damageLocationsSelected.REPAIR.toUpperCase()))
-    console.log(otherFieldValue.toString().toUpperCase().includes(damageLocationsSelected.WINDSHIELD.toUpperCase()))
-    console.log(Array.isArray(otherFieldValue))
-    console.log(otherFieldValue.length > 1)
-    // this.$nextTick();
-    if (value.toString().toUpperCase().includes(damageLocationsSelected.REPAIR.toUpperCase()) &&
-        otherFieldValue.toString().toUpperCase().includes(damageLocationsSelected.WINDSHIELD.toUpperCase()) &&
-        Array.isArray(otherFieldValue) &&
-        otherFieldValue.length > 1)
-    {
-        console.log("A")
-        return false;
-    }
-    console.log("B")
-    return true;
-});
 defineRule("repair-only", (value) => {
     if (value.toString().toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase()) {
         return true;
@@ -204,7 +180,7 @@ export default ({
         },
         windshieldDamageTypeQuestionValidationRules() {
             // Note: the validation rules string is not dynamic (it cannot be changed once component has been created)
-            let validationRules = "windshield-damage-type-required|check-for-repair-and-replace:@DamageLocationQuestion";
+            let validationRules = "windshield-damage-type-required";
             // if vehicle has no windshield replacement option
             if (!this.isWindshieldReplaceAvailable) {
                 validationRules = validationRules.concat('|repair-only');
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 01ca30a8b..57537668f 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -1,7 +1,5 @@
 <template>
   <div :class="{'h-100': !isWide}">
-    {{ errors }}
-    <br>{{ hasError }}
     <div
       class="list-card w-100 rounded-3 d-flex align-items-center"
       :class="[