diff --git a/src/store/index.js b/src/store/index.js
index 56fdbf63..99d0c7bb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1572,6 +1572,8 @@ export const useMainStore = defineStore({
         resetServiceLocationProvider() {
             this.order.serviceLocation.provider = {
                 providerNumber: null,
+                companyName: null,
+                phoneNumber: null,
                 address: {
                     streetAddress: null,
                     city: null,
@@ -1757,10 +1759,17 @@ export const useMainStore = defineStore({
 
         resetPolicy() {
             this.order.policy.policyNumber = null;
+            this.order.policy.policyZipCode = null;
             this.order.policy.dateOfLoss = null;
             this.order.policy.damageCause = null;
             this.order.policy.damageCity = null;
             this.order.policy.damageState = null;
+            this.order.policy.vehicles = [];
+            this.order.policy.endorsements = [];
+            this.order.policy.endorsementQuestionAnswers = [];
+            this.order.policy.policyData = null;
+            this.order.policy.deductible.repair = null;
+            this.order.policy.deductible.replace = null;
         },
 
         resetCustomer() {
@@ -1813,6 +1822,7 @@ export const useMainStore = defineStore({
         resetGlassPartsState() {
             this.order.lineItems.glassParts = null;
             this.order.lineItems.supportingItems = null;
+            this.order.lineItems.vaps = null;
             this.order.lineItems.feeItems = [];
             this.order.lineItems.serverData = null;
             this.order.damage.partQuestionAnswers = null;
@@ -2490,6 +2500,16 @@ export const useMainStore = defineStore({
             this.resetServiceLocationAndDependencies();
         },
 
+        resetServiceLocation() {
+            this.order.serviceLocation.state = null;
+            this.order.serviceLocation.zipCode = null;
+            this.order.serviceLocation.zipCodeCtu = null;
+            this.order.serviceLocation.defaultProviderNumber = null;
+            this.order.serviceLocation.appointmentType = null;
+            this.order.serviceLocation.IsSafeliteProvider = null;
+            this.resetServiceLocationProvider();
+        },
+
         resetPageFields() {
             this.resetOrder();
             this.resetCustomer();
@@ -2499,6 +2519,8 @@ export const useMainStore = defineStore({
             this.resetDamageState();
             this.resetGlassPartsState();
             this.resetInsurance();
+            this.resetServiceLocation();
+            this.resetSchedule();
             this.resetBailout();
             this.resetSubmittedOrder();
         },