diff --git a/components/core/Layout/Layout.tsx b/components/core/Layout/Layout.tsx
index 4b9f98812..63ec7a238 100644
--- a/components/core/Layout/Layout.tsx
+++ b/components/core/Layout/Layout.tsx
@@ -3,6 +3,7 @@ import cn from 'classnames'
 import { ThemeProvider } from 'next-themes'
 import { SSRProvider, OverlayProvider } from 'react-aria'
 import type { Page } from '@lib/bigcommerce/api/operations/get-all-pages'
+import { CommerceProvider } from '@lib/bigcommerce'
 import { Navbar, Featurebar, Footer } from '@components/core'
 import { Container, Sidebar } from '@components/ui'
 import { CartSidebarView } from '@components/cart'
@@ -44,9 +45,11 @@ const Layout: FC<LayoutProps> = ({ children, pageProps }) => (
   <ThemeProvider>
     <SSRProvider>
       <OverlayProvider>
-        <UIProvider>
-          <CoreLayout pages={pageProps.pages}>{children}</CoreLayout>
-        </UIProvider>
+        <CommerceProvider locale="en-us">
+          <UIProvider>
+            <CoreLayout pages={pageProps.pages}>{children}</CoreLayout>
+          </UIProvider>
+        </CommerceProvider>
       </OverlayProvider>
     </SSRProvider>
   </ThemeProvider>
diff --git a/lib/bigcommerce/api/checkout.ts b/lib/bigcommerce/api/checkout.ts
index cf9230c72..531f6d9e4 100644
--- a/lib/bigcommerce/api/checkout.ts
+++ b/lib/bigcommerce/api/checkout.ts
@@ -43,7 +43,6 @@ const checkoutApi: BigcommerceApiHandler<any> = async (req, res, config) => {
           <script>
             window.onload = function() {
               checkoutKitLoader.load('checkout-sdk').then(function (service) {
-                console.log('SERVICE', service)
                 service.embedCheckout({
                   containerId: 'checkout',
                   url: '${data.embedded_checkout_url}'
diff --git a/lib/bigcommerce/api/operations/get-all-pages.ts b/lib/bigcommerce/api/operations/get-all-pages.ts
index 04e9ee214..5aa5bde2d 100644
--- a/lib/bigcommerce/api/operations/get-all-pages.ts
+++ b/lib/bigcommerce/api/operations/get-all-pages.ts
@@ -1,5 +1,4 @@
 import type { RecursivePartial, RecursiveRequired } from '../utils/types'
-import filterEdges from '../utils/filter-edges'
 import { BigcommerceConfig, getConfig } from '..'
 import { definitions } from '../definitions/store-content'
 
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 73921dbf0..dfa00b6aa 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -5,10 +5,9 @@ import 'animate.css'
 import { FC } from 'react'
 import { DefaultSeo } from 'next-seo'
 import type { AppProps } from 'next/app'
+import Head from 'next/head'
 
 import config from '../config.json'
-import Head from 'next/head'
-import { CommerceProvider } from '@lib/bigcommerce'
 
 const Noop: FC = ({ children }) => <>{children}</>
 
@@ -22,11 +21,9 @@ export default function MyApp({ Component, pageProps }: AppProps) {
         <link rel="manifest" href="/site.webmanifest" key="site-manifest" />
       </Head>
       <DefaultSeo {...config.seo} />
-      <CommerceProvider locale="en-us">
-        <Layout pageProps={pageProps}>
-          <Component {...pageProps} />
-        </Layout>
-      </CommerceProvider>
+      <Layout pageProps={pageProps}>
+        <Component {...pageProps} />
+      </Layout>
     </>
   )
 }