diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 533a2b27..dd1b0570 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -405,7 +405,7 @@ export default {
                 // mimic part-questions page data for consistency
                 for (let partOrQuestion of partsOrQuestions) {
                     if (this.hasCapabilityQuestions([partOrQuestion])) {
-                        let capabilityQuestionsForGlassLocation = (await useMainStore().getCapabilityQuestions(useMainStore().vehicle.carId, partOrQuestion.parts[0].partNumber));
+                        let capabilityQuestionsForGlassLocation = (await this.mainStore.getCapabilityQuestions(this.mainStore.vehicle.carId, partOrQuestion.parts[0].partNumber));
 
                         capabilityQuestionsForGlassLocation.forEach((question) => {
                             question.answers = question.answers.map((answer) => {
diff --git a/src/store/index.js b/src/store/index.js
index 6a51b97e..d875d8c7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -57,12 +57,6 @@ const getDefaultState = () => {
             isVerified: false,
         },
       },
-      serviceLocation: {
-        address: null,
-        city: null,
-        state: null,
-        zipCode: null,
-      },
       referralNumber: null,
       referralDate: null,
       accountNumber: 0,