diff --git a/.prettierrc b/.prettierrc
index 21209f49e..f1c8e7129 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,4 +1,4 @@
 {
-    "tabWidth": 4,
+    "tabWidth": 2,
     "bracketSameLine": true
 }
\ No newline at end of file
diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 68b2ac9b5..1346a4f0e 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -50,8 +50,6 @@
                             :validationRules="validationRules"
                             :textPosition="textPosition"
                             :selectOnKeypress="selectOnKeypress"
-                            @blur="handleBlur"
-                            @focus="handleFocus"
                             @buttonClicked="handleAnswerChange" />
                         <!-- For nested questions -->
                         <transition name="fade" mode="out-in">
@@ -161,7 +159,7 @@ export default {
         getComponentWrapperClasses() {
             let classes = "";
 
-            classes += this.isWid ? "col-12" : "col";
+            classes += this.isWide ? "col-12" : "col";
 
             if (this.buttonType == "radio") {
                 classes += " radio-button-container";
@@ -224,17 +222,6 @@ export default {
             this.$emit("buttonQuestionChange", primaryAnswerValue);
             this.$emit("update:modelValue", primaryAnswerValue);
         },
-        handleBlur() {
-            // this.lastFocusedInputGroup = this.groupName;
-            // window.lastFocusedInputGroup = this.groupName
-            // console.log("blur: ", this.groupName);
-        },
-        handleFocus() {
-            // console.log("focused: ", {
-            //     groupName: this.groupName,
-            //     lastFocusedInputGroup: this.lastFocusedInputGroup,
-            // });
-        },
     },
     components: {
         listButton,
diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue
index 71d517e77..01672f2f3 100644
--- a/src/common-components/question-chain/question-chain.vue
+++ b/src/common-components/question-chain/question-chain.vue
@@ -1,17 +1,6 @@
 <template>
     <div v-for="(q, i) in questions" :key="i">
         <transition appear name="fade" mode="out-in">
-            <!-- <buttonQuestion
-                v-if="q.answerSelected || (q.questionSequence === currentQuestionNum)"
-                class="radioQuestion"
-                :class="(q.questionSequence === currentQuestionNum) && 'current-question'"
-                :questionText="q.questionText"
-                :answers="q.answers"
-                :groupName="`question-${glassIndex}-${q.questionSequence}`"
-                v-model="q.answerSelected"
-                isRequired
-                :validationRules="validationRules"
-            /> -->
             <buttonQuestion
                 v-if="q.answerSelected || (q.questionSequence === currentQuestionNum)"
                 class="radioQuestion"
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 8bc78ea5d..62a6995d3 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -18,7 +18,6 @@ export async function loadOrderIfPresent() {
         return null;
     }
 
-    // TODO KO isOrderDifferent and isOrderSubmitted
     // Reset state if cookie says to.
     if (funnelCookie.ShouldResetState) {
         baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
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 df4d045c7..b3d7f537c 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
@@ -20,11 +20,9 @@
 <script>
 import buttonQuestion from "@/common-components/button-question/button-question";
 import store from "@/store";
-// import buttonQuestionWrapperMixin from "@/mixins/button-question-wrapper-mixin";
 
 export default ({
     name: "replaceOptionsQuestion",
-    // mixins: [buttonQuestionWrapperMixin],
     data() {
         return {
             replaceOptions: [],
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 a887368ba..c2188f9e8 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
@@ -17,11 +17,9 @@
 
 <script>
 import buttonQuestion from "@/common-components/button-question/button-question";
-// import buttonQuestionWrapperMixin from "@/mixins/button-question-wrapper-mixin";
 
 export default ({
     name: "windshieldChipCountQuestion",   
-    // mixins: [buttonQuestionWrapperMixin],
     data() {
         return {
             numberOfChips: this.modelValue
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 0ff4a2371..5a275c45f 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
@@ -19,11 +19,9 @@
 
 <script>
 import buttonQuestion from "@/common-components/button-question/button-question";
-// import buttonQuestionWrapperMixin from "@/mixins/button-question-wrapper-mixin";
 
 export default {
     name: "windshieldDamageTypeQuestion",
-    // mixins: [buttonQuestionWrapperMixin],
     data() {
         return {
             selectedWindshieldDamageType: this.modelValue,
diff --git a/src/layouts/vehicle-make/make-question/make-question.vue b/src/layouts/vehicle-make/make-question/make-question.vue
index 4b783f2c5..c3e906cdd 100644
--- a/src/layouts/vehicle-make/make-question/make-question.vue
+++ b/src/layouts/vehicle-make/make-question/make-question.vue
@@ -18,11 +18,9 @@ import buttonQuestion from "@/common-components/button-question/button-question"
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
-// import buttonQuestionWrapperMixin from "../../../mixins/button-question-wrapper-mixin";
 
 export default {
     name: "make-question",
-    // mixins: [buttonQuestionWrapperMixin],
     data() {
         return {
             makes: [],
diff --git a/src/layouts/vehicle-model/model-question/model-question.vue b/src/layouts/vehicle-model/model-question/model-question.vue
index a302a80f1..2c1dc46bd 100644
--- a/src/layouts/vehicle-model/model-question/model-question.vue
+++ b/src/layouts/vehicle-model/model-question/model-question.vue
@@ -19,11 +19,9 @@ import buttonQuestion from "@/common-components/button-question/button-question"
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import buttonQuestionWrapperMixin from "@/mixins/button-question-wrapper-mixin";
 
 export default {
   name: "model-question",
-  mixins: [buttonQuestionWrapperMixin],
   data() {
     return {
       models: [],
diff --git a/src/layouts/vehicle-style/style-question/style-question.vue b/src/layouts/vehicle-style/style-question/style-question.vue
index 039530f81..8e60df50d 100644
--- a/src/layouts/vehicle-style/style-question/style-question.vue
+++ b/src/layouts/vehicle-style/style-question/style-question.vue
@@ -19,11 +19,9 @@ import buttonQuestion from "@/common-components/button-question/button-question"
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
-// import buttonQuestionWrapperMixin from "@/mixins/button-question-wrapper-mixin";
 
 export default {
   name: "style-question",
-  // mixins: [buttonQuestionWrapperMixin],
   data() {
     return {
       styles: [],
diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue
index 694a81cd9..1835a7f74 100644
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@@ -20,11 +20,9 @@ import buttonQuestion from "@/common-components/button-question/button-question"
 // Supporting files
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
-// import buttonQuestionWrapperMixin from "@/mixins/button-question-wrapper-mixin";
 
 export default {
   name: "year-question",
-  // mixins: [buttonQuestionWrapperMixin],
   data() {
     return {
       years: [],
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index c8a10cdeb..2c409e102 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -74,9 +74,6 @@ export default {
             const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
             const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
 
-            console.log({
-                hasGlassLocationWithMultipleParts: hasGlassLocationWithMultipleParts
-            })
             if (hasPartQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)) {
                 self.$router.navigateWithSaving(self.navigationScenarios.HAS_PART_QUESTIONS, self.$route, {}, {}, { partsOrQuestions: partsOrQuestions });
             }
diff --git a/src/router/index.js b/src/router/index.js
index 9dd7b2acf..4daa23613 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -233,8 +233,6 @@ function navigateToUrl(url, optionalQuery = {}) {
     externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
   }
 
-  externalUrl.searchParams.append("experiments", "ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_TEST=true");
-
   window.location.assign(externalUrl);
 }