diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 42c9ec43..1e96344e 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -16,7 +16,6 @@ import {
 } from "@/constants/analytics";
 import { cookieNames } from "@/constants/cookie-names";
 import { useMainStore } from "@/store";
-import { mapStores, storeToRefs } from "pinia";
 
 export default {
     methods: {                
@@ -164,8 +163,6 @@ export default {
         },
     },
     computed: {
-        //...mapStores(useMainStore),
-
         analyticsPageEvents() {
             return analyticsPageEvents;
         },
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 495c834f..d6235c06 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -1,5 +1,5 @@
 
-import { mapActions, mapStores } from "pinia";
+import { mapStores } from "pinia";
 import { useMainStore } from "@/store";
 ;
 import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
@@ -24,20 +24,10 @@ export default {
       const footerInfoBox = document.querySelector(".footer#infoBox");
       return footerInfoBox ? footerInfoBox.offsetHeight : 0;
     },
-    dispatchStoreAction(type, payload, encodePayload = true) {
-
-      const store = useMainStore();
-      // Encode the payload if required
-      if (encodePayload) {
-          encodeUriData(payload);
-      }
-      
-      return store[type](payload);
-    },
   },
   computed: {
     // store will be accessible globally as its id + 'Store'        
-    //...mapStores(useMainStore),
+    ...mapStores(useMainStore),
 
     navigationScenarios() {
       return navigationScenarios;