diff --git a/src/common-components/base-input-button/base-input-button.vue b/src/common-components/base-input-button/base-input-button.vue
index 5a8883557..5814a3323 100644
--- a/src/common-components/base-input-button/base-input-button.vue
+++ b/src/common-components/base-input-button/base-input-button.vue
@@ -3,7 +3,6 @@
         :class="[buttonWrapperClasses, { 'has-error': errors.length > 0 }]"
         :for="buttonId"
         @mousedown.left="handleEventAction('click', $event)">
-        <!-- BIB props: {{$props}} -->
         <input
             :type="inputType"
             :id="buttonId"
@@ -42,17 +41,6 @@ export default {
             required: true,
         },
         isMultiSelect: Boolean,
-        // isWide: Boolean,
-        // buttonImage: String,
-        // buttonImageId: String,
-        // buttonLabel: {
-        //     type: String,
-        //     required: true,
-        // },
-        // buttonLabelSubCopy: {
-        //     type: String,
-        //     required: true,
-        // },
         groupName: {
             type: String,
             required: true,
diff --git a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
index 0741607bc..0d22e03a5 100644
--- a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
+++ b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
@@ -1,7 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
         <div v-if="shouldDisplayReplaceOptionsQuestion" class="replace-options-question" :class="this.answersToDisplay.length < 2 ? 'd-none' : ''" aria-live="polite">
-            ROQ selectedValue: {{selectedValue}}
             <buttonQuestion
                 isWide
                 :questionText="questionText"
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
index af063722f..f2b5b0948 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
@@ -1,7 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
         <div class="windshield-chip-count-question" v-if="isAvailable" aria-live="polite">
-            WCCQ selectedValue: {{selectedValue}}
             <buttonQuestion
                 :questionText="questionText"
                 :answers="answersFromCms"
diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index 9147076c8..158c7642e 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -5,10 +5,6 @@
     <div class="nested-radio">
         <div class="row my-2">
             <div class="col">
-                modelValue: {{modelValue}} <br/>
-                selectedTint: {{selectedTint}}   <br/>
-                selectedPartNumber: {{selectedPartNumber}} <br/>
-                tintSelectionOptions: {{tintSelectionOptions}}
                 <buttonQuestion
                     v-model="selectedTint"
                     :answers="tintSelectionOptions"
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 03688a864..f59f130fa 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -25,7 +25,6 @@
             </div>
           </div>
         </div>
-        glassParts: {{glassParts}}
         <div v-for="(item, i) in PartsOrQuestions" :key="i">
           <!-- Render horizontal lines if there is multi-glass (aka if i > 0) -->
           <hr v-if="i > 0" />
diff --git a/src/mixins/input-button-wrapper-mixin.js b/src/mixins/input-button-wrapper-mixin.js
index 02009c385..449930a6a 100644
--- a/src/mixins/input-button-wrapper-mixin.js
+++ b/src/mixins/input-button-wrapper-mixin.js
@@ -24,6 +24,10 @@ export default {
     },
     methods: {
         handleAnswerChange(e) {
+            if (this.preHandleAnswerChange) {
+                this.preHandleAnswerChange(e)
+            }
+            
             this.$emit("change", e);
         },
     },
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index ae8e1f781..7610a6d4b 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -1,19 +1,8 @@
 <template>
-    <!-- <baseInputButton
-        :isMultiSelect="isMultiSelect"
-        :value="value"
-        :modelValue="modelValue"
-        :groupName="groupName"
-        :validationRules="validationRules"
-        buttonWrapperClasses="list-group list-button rounded-3 d-flex flex-column w-100 mb-2"
-        @change="handleAnswerChange"> -->
     <baseInputButton
         v-bind="$props"
         buttonWrapperClasses="list-group list-button rounded-3 d-flex flex-column w-100 mb-2"
         @change="handleAnswerChange">
-        <!-- modelValue: {{modelValue}}<br/>
-        value: {{value}} <br/>
-        buttonLabel: {{buttonLabel}} -->
         <div
             tabindex="-1"
             :aria-label="buttonLabel"
@@ -62,12 +51,10 @@ export default {
         displayLoader() {
             this.isLoaderDisplayed = true;
         },
-        handleAnswerChange(e) {
+        preHandleAnswerChange() {
             if (this.selectingInitiatesLoad) {
                 this.displayLoader();
             }
-
-            this.$emit("change", e);
         },
     },
     components: {