diff --git a/.github/workflows/deploy-vue-storefront-cloud.yml b/.github/workflows/deploy-vue-storefront-cloud.yml
index 85e96363b..149f60595 100644
--- a/.github/workflows/deploy-vue-storefront-cloud.yml
+++ b/.github/workflows/deploy-vue-storefront-cloud.yml
@@ -53,19 +53,19 @@ jobs:
     uses: ./.github/workflows/deployment-template.yml
     needs: build
     if: github.ref == 'refs/heads/main'
-    with: 
+    with:
       github_environment_name: production
       environment_code: demo-magento2
       target_url: https://demo-magento2.europe-west1.gcp.storefrontcloud.io
     secrets:
       cloud_username: ${{ secrets.CLOUD_USERNAME }}
       cloud_password: ${{ secrets.CLOUD_PASSWORD }}
-      
+
   deploy-develop:
     uses: ./.github/workflows/deployment-template.yml
     needs: build
     if: github.ref == 'refs/heads/develop'
-    with: 
+    with:
       github_environment_name: dev
       environment_code: demo-magento2-dev
       target_url: https://demo-magento2-dev.europe-west1.gcp.storefrontcloud.io
@@ -77,7 +77,7 @@ jobs:
     uses: ./.github/workflows/deployment-template.yml
     needs: build
     if: startsWith(github.ref, 'refs/heads/release')
-    with: 
+    with:
       github_environment_name: canary
       environment_code: demo-magento2-canary
       target_url: https://demo-magento2-canary.europe-west1.gcp.storefrontcloud.io
@@ -89,7 +89,7 @@ jobs:
     uses: ./.github/workflows/deployment-template.yml
     needs: build
     if: github.ref == 'refs/heads/enterprise'
-    with: 
+    with:
       github_environment_name: enterprise
       environment_code: demo-magento2-enterprise
       target_url: https://demo-magento2-enterprise.europe-west1.gcp.storefrontcloud.io
diff --git a/packages/theme/components/CurrencySelector/CurrenciesModal.vue b/packages/theme/components/CurrencySelector/CurrenciesModal.vue
index 2750f4bd2..8f2ba806c 100644
--- a/packages/theme/components/CurrencySelector/CurrenciesModal.vue
+++ b/packages/theme/components/CurrencySelector/CurrenciesModal.vue
@@ -14,11 +14,7 @@
         <a
           href="/"
           :class="selectedCurrency === currency ? 'container__currency--selected-label' : ''"
-          @click.prevent="handleChanges({
-            callback: () => changeCurrency({id: currency}),
-            redirect: false,
-            refresh: true
-          })"
+          @click.prevent="changeCurrency({id: currency})"
         >
           <SfCharacteristic class="currency">
             <template #title>
@@ -42,7 +38,6 @@ import {
 import {
   useCurrency,
 } from '~/composables';
-import { useHandleChanges } from '~/helpers/magentoConfig/handleChanges';
 
 export default defineComponent({
   name: 'CurrenciesModal',
@@ -63,8 +58,6 @@ export default defineComponent({
       load: loadCurrencies,
     } = useCurrency();
 
-    const { handleChanges } = useHandleChanges();
-
     const availableCurrencies = computed(() => currencies.value?.available_currency_codes || []);
 
     onMounted(() => {
@@ -74,7 +67,6 @@ export default defineComponent({
 
     return {
       changeCurrency,
-      handleChanges,
       availableCurrencies,
     };
   },
diff --git a/packages/theme/components/StoreSwitcher/StoresModal.vue b/packages/theme/components/StoreSwitcher/StoresModal.vue
index 0f8f8f579..33d7c0d67 100644
--- a/packages/theme/components/StoreSwitcher/StoresModal.vue
+++ b/packages/theme/components/StoreSwitcher/StoresModal.vue
@@ -17,13 +17,7 @@
               ? 'container__store--selected'
               : ''
           "
-          @click="
-            handleChanges({
-              callback: () => changeStore(store),
-              redirect: false,
-              windowRefresh: true,
-            })
-          "
+          @click.prevent="changeStore(store)"
         >
           <SfCharacteristic class="language">
             <template #title>
@@ -57,7 +51,6 @@ import {
 } from '@storefront-ui/vue';
 import { useStore } from '~/composables';
 import { storeGetters, storeConfigGetters } from '~/getters';
-import { useHandleChanges } from '~/helpers/magentoConfig/handleChanges';
 
 export default defineComponent({
   name: 'StoresModal',
@@ -73,8 +66,6 @@ export default defineComponent({
   },
   emits: ['closeModal'],
   setup() {
-    const { handleChanges } = useHandleChanges();
-
     const {
       stores,
       change: changeStore,
@@ -91,7 +82,6 @@ export default defineComponent({
     return {
       storeGetters,
       storeConfigGetters,
-      handleChanges,
       availableStores,
       changeStore,
     };
diff --git a/packages/theme/composables/useCurrency/index.ts b/packages/theme/composables/useCurrency/index.ts
index f097d09d5..848873db6 100644
--- a/packages/theme/composables/useCurrency/index.ts
+++ b/packages/theme/composables/useCurrency/index.ts
@@ -40,6 +40,7 @@ const useCurrency = (): UseCurrency => {
 
     try {
       app.$vsf.$magento.config.state.setCurrency(params.id);
+      window.location.reload();
     } catch (err) {
       Logger.debug('[ERROR] useCurrency/change', err);
       error.value.change = err;
diff --git a/packages/theme/composables/useStore/index.ts b/packages/theme/composables/useStore/index.ts
index 07b2939ab..b288932ea 100644
--- a/packages/theme/composables/useStore/index.ts
+++ b/packages/theme/composables/useStore/index.ts
@@ -43,6 +43,8 @@ const useStore: UseStore = (): UseStoreInterface => {
       app.$vsf.$magento.config.state.setStore(storeConfigGetters.getCode(store));
       app.$vsf.$magento.config.state.setCurrency(storeConfigGetters.getCurrency(store));
       app.$vsf.$magento.config.state.setLocale(storeConfigGetters.getCode(store));
+      const newStoreUrl = app.switchLocalePath(storeConfigGetters.getCode(store));
+      window.location.replace(newStoreUrl);
     } catch (err) {
       error.value.change = err;
     }
diff --git a/packages/theme/helpers/magentoConfig/handleChanges.ts b/packages/theme/helpers/magentoConfig/handleChanges.ts
deleted file mode 100644
index 7e3c33e46..000000000
--- a/packages/theme/helpers/magentoConfig/handleChanges.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useRoute, useRouter } from '@nuxtjs/composition-api';
-
-export const useHandleChanges = () => {
-  const route = useRoute();
-  const router = useRouter();
-
-  const {
-    path,
-    fullPath,
-  } = route.value;
-
-  const handleChanges = async ({
-    callback,
-    redirect = true,
-    refresh = false,
-    windowRefresh = false,
-  }) => {
-    if (callback) {
-      await callback();
-    }
-
-    if (redirect) {
-      await router.replace(path);
-    }
-
-    if (refresh) {
-      // @ts-ignore
-      router.go(fullPath);
-    }
-
-    if (windowRefresh) {
-      window.location.reload();
-    }
-  };
-
-  return {
-    handleChanges,
-  };
-};
diff --git a/packages/theme/modules/magento/index.ts b/packages/theme/modules/magento/index.ts
index ef5c87f7d..28c6c58c2 100644
--- a/packages/theme/modules/magento/index.ts
+++ b/packages/theme/modules/magento/index.ts
@@ -1,31 +1,8 @@
 /* eslint-disable unicorn/prefer-module */
 const path = require('path');
 
-const mapI18nSettings = (i18n) => ({
-  locales: i18n.locales.map(({ label, code }) => ({ name: code, label })),
-});
-
-const isNuxtI18nUsed = (moduleOptions) => moduleOptions.i18n && moduleOptions.i18n.useNuxtI18nConfig;
-
-const getMissingFields = (options) => [
-  'locales',
-].filter((o) => options[o] === undefined);
-
 // eslint-disable-next-line func-names
-export default function (moduleOptions) {
-  const options = isNuxtI18nUsed(moduleOptions)
-    ? {
-      ...moduleOptions,
-      ...mapI18nSettings(this.options.i18n),
-    }
-    : moduleOptions;
-
-  const missingFields = getMissingFields(options);
-
-  if (missingFields.length > 0) {
-    throw new Error(`Please provide missing i18n fields: (${missingFields.join(', ')})`);
-  }
-
+export default function (options) {
   this.extendBuild((config) => {
     // eslint-disable-next-line no-param-reassign
     config.resolve.alias['@vue-storefront/magento-api$'] = require.resolve('@vue-storefront/magento-api');
diff --git a/packages/theme/nuxt.config.js b/packages/theme/nuxt.config.js
index e39f28ae9..fd11af470 100755
--- a/packages/theme/nuxt.config.js
+++ b/packages/theme/nuxt.config.js
@@ -67,27 +67,21 @@ export default () => {
       '@nuxtjs/style-resources',
       '@nuxtjs/device',
       ['@vue-storefront/nuxt', {
-        // @core-development-only-start
-        coreDevelopment: true,
-        // @core-development-only-end
-        useRawSource: {
-          dev: [
-            '@vue-storefront/core',
-          ],
-          prod: [
-            '@vue-storefront/core',
-          ],
-        },
         // selectively disabling certain @vue-storefront/core plugins for migration
         context: false,
         logger: false,
         ssr: false,
         sfui: false,
+        i18nExtension: false,
+        e2e: true,
+        performance: {
+          httpPush: false,
+          purgeCSS: {
+            enabled: false,
+          },
+        },
       }],
       ['~/modules/magento', {
-        i18n: {
-          useNuxtI18nConfig: true,
-        },
         cookies,
         externalCheckout,
         defaultStore,
@@ -149,11 +143,6 @@ export default () => {
         },
       ],
       defaultLocale: 'default',
-      autoChangeCookie: {
-        currency: false,
-        locale: false,
-        country: false,
-      },
       lazy: true,
       seo: true,
       langDir: 'lang/',
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 5d2f2d03b..7b4056392 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -36,9 +36,8 @@
     "@pinia/nuxt": "^0.1.8",
     "@storefront-ui/vue": "^0.13.0",
     "@vue-storefront/cache": "~2.5.6",
-    "@vue-storefront/core": "~2.5.6",
-    "@vue-storefront/middleware": "~2.5.6",
     "@vue-storefront/magento-api": "~1.0.0-rc.6",
+    "@vue-storefront/middleware": "~2.5.6",
     "@vue-storefront/nuxt": "~2.5.6",
     "@vue-storefront/redis-cache": "^1.0.1",
     "axios": "^0.26.1",
diff --git a/packages/theme/plugins/__tests__/i18n.spec.js b/packages/theme/plugins/__tests__/i18n.spec.js
index 52b22f301..6d2daeed4 100644
--- a/packages/theme/plugins/__tests__/i18n.spec.js
+++ b/packages/theme/plugins/__tests__/i18n.spec.js
@@ -121,8 +121,5 @@ describe('i18n plugin', () => {
     expect(testCaseAppMock.$vsf.$magento.config.state.setLocale).toHaveBeenCalledWith('de_DE');
     expect(testCaseAppMock.$vsf.$magento.config.state.setStore).toHaveBeenCalledWith('de_DE');
     expect(testCaseAppMock.$vsf.$magento.config.state.setCurrency).toHaveBeenCalledWith('EUR');
-    expect(callbackRequest.headers.cookie).toMatchInlineSnapshot(
-      '"vsf-store=de_DE; vsf-locale=de_DE; vsf-currency=EUR; vsf-country=PL; vsf-customer=12fg45; vsf-cart=123 "',
-    );
   });
 });
diff --git a/packages/theme/plugins/i18n.ts b/packages/theme/plugins/i18n.ts
index 99750783d..417a56c51 100644
--- a/packages/theme/plugins/i18n.ts
+++ b/packages/theme/plugins/i18n.ts
@@ -60,34 +60,6 @@ const setDefaultLocale = async (i18n) => {
   await i18n.setLocale(i18n.defaultLocale);
 };
 
-/**
- * Prepare new cookie string based on app state.
- *
- * @param apiState {ConfigState}
- * @param newStoreCode {string}
- * @param currency {string}
- * @returns {string}
- */
-const prepareNewCookieString = (apiState: ConfigState, newStoreCode: string, currency: string) => {
-  const customerTokenCookie = apiState.getCustomerToken();
-  const cartIdCookie = apiState.getCartId();
-
-  let cookie = `vsf-store=${newStoreCode}; `;
-  cookie += `vsf-locale=${newStoreCode}; `;
-  cookie += `vsf-currency=${currency}; `;
-  cookie += `vsf-country=${apiState.getCountry()}; `;
-
-  if (customerTokenCookie) {
-    cookie += `vsf-customer=${customerTokenCookie}; `;
-  }
-
-  if (cartIdCookie) {
-    cookie += `vsf-cart=${cartIdCookie} `;
-  }
-
-  return cookie;
-};
-
 export default async ({ app, route }: Context) => {
   await app.$vsf.$magento.client.interceptors.request.use(async (request) => {
     const { i18n } = app;
@@ -110,9 +82,6 @@ export default async ({ app, route }: Context) => {
       apiState.setStore(i18nCurrentLocaleCode);
       apiState.setLocale(i18nCurrentLocaleCode);
       apiState.setCurrency(currency);
-
-      // eslint-disable-next-line no-param-reassign
-      request.headers.cookie = prepareNewCookieString(apiState, i18nCurrentLocaleCode, currency);
     }
 
     return request;