diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index f3e73b6d0..67f48af4e 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -69,19 +69,7 @@ export default ({
 			}),
 		},
 		validationRules: String,       
-	},
-	setup(props, { emit }) {
-		// Please do not modify, this "computed" is used to track and report 
-		// this object's property changes to the parent component
-		const addressModel = computed({  // Use computed to wrap the object
-			get: () => props.modelValue,
-			set: (value) => emit('update:modelValue', value),
-		});
-
-		return { 
-			addressModel,
-		};
-	},           
+	},          
 	data() {
 		return {
 			showAddressFields: false,
@@ -150,7 +138,15 @@ export default ({
 					'WY': 'Wyoming',            
 				}
 			}
-		}
+		},
+		addressModel: {
+			get: function() {
+				return this.modelValue;
+			},
+			set: function(newValue) {
+				this.$emit("update:modelValue", newValue);
+			}
+		},
 	},
 	methods: {
 		initializeComponent(cmsContent) {
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index 7fa324f91..2bf6e66c3 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -20,12 +20,10 @@
 <script>
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import { computed } from 'vue';
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-//import store from "@/store";
 
 // DEFINE VALIDATION RULES
 defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
@@ -33,8 +31,6 @@ defineRule("last-name-required", required(errorMessages.LAST_NAME_REQUIRED));
 defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED));
 defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+).([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT));
 
-//EMAIL_ADDRESS_FORMAT
-
 export default ({
 	name: "customer-questions",
 	emits: ['update:modelValue'], // The component emits an event
@@ -57,16 +53,6 @@ export default ({
 		},
 		validationRules: String,       
 	},    
-	setup(props, { emit }) {
-		// Please do not modify, this "computed" is used to track and report 
-		// this object's property changes to the parent component
-		const customerModel = computed({  // Use computed to wrap the object
-			get: () => props.modelValue,
-			set: (value) => emit('update:modelValue', value),
-		});
-
-		return { customerModel };
-	},     
 	methods: {
 		initializeComponent(cmsContent){
 			// pass alert texts to addressQuestions component
@@ -78,7 +64,7 @@ export default ({
 		}
 	},
 	computed: {
-		value: {
+		customerModel: {
 			get: function() {
 				return this.modelValue;
 			},
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 1b8ae2449..3fe056d2b 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -58,6 +58,7 @@ const routingTable = [
         scenario: navigationScenarios.CLICKED_BACK,
         destinationFmgPageValue: fmgPageValues.VEHICLE_STYLE,
       },
+      // UNDO THESE CHANGES BEFORE MERGING TO develop
       {
         scenario: navigationScenarios.SELECTED_DAMAGE_WITH_SINGLE_PART,
         destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP
@@ -70,6 +71,7 @@ const routingTable = [
         scenario: navigationScenarios.SELECTED_DAMAGE_WITH_PART_QUESTIONS,
         destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
       },
+      // END
     ],
   },
   {