diff --git a/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue b/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
index 345a16d1e..ec257ceec 100644
--- a/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
+++ b/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
@@ -68,15 +68,13 @@ export default ({
             }
         },
         answersToDisplay(){
-            const data = Array.isArray(this.answersFromCms) 
+            return Array.isArray(this.answersFromCms) 
                 ? this.answersFromCms.filter(ans => 
                     {
                         const name = ans.Name.split('-');
                         return name[0].toUpperCase() === store.getters.vehicle.category && this.damageOptionsMap[name[1]];
                     }) 
                 : [];
-                console.log('data: ', data);
-                return data;
         },
     },
     components: {
diff --git a/src/layouts/vehicle-damage/windshield-chip-count-question/windshield-chip-count-question.vue b/src/layouts/vehicle-damage/windshield-chip-count-question/windshield-chip-count-question.vue
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/router/index.js b/src/router/index.js
index 364ef9594..133a4106e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -74,9 +74,9 @@ const routes = [
             .filter((x) => x.name === routeData[0].name)[0]
             .components.default();
 
-          // if (!arePagePrerequisitesValid(nextComponent)) {
-          //   await GoToFunnelStartOn404(next);
-          // }
+          if (!arePagePrerequisitesValid(nextComponent)) {
+            await GoToFunnelStartOn404(next);
+          }
 
           // Assign current query string parameters, as well as our fmgPage one.
           next({
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index ebc52b83f..7550c9ec4 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -48,7 +48,6 @@
 </template>
 
 <script>
-import { toRefs } from "vue";
 import { useField } from "vee-validate";
 
 export default {
@@ -107,17 +106,16 @@ export default {
     }
   },
   setup(props) {
-    const { groupName, value } = toRefs(props);
     const inputType = props.isMultiSelect ? "checkbox" : "radio";
 
     const { 
         value: inputValue,
         handleChange,
         errors,
-    } = useField(groupName, props.validationRules, 
+    } = useField(props.groupName, props.validationRules, 
     {
       type: inputType,
-      checkedValue: value,
+      checkedValue: props.value,
     });
     return {
       handleChange,