diff --git a/packages/logos-docusaurus-theme/src/client/theme/BlogHeader/index.tsx b/packages/logos-docusaurus-theme/src/client/theme/BlogHeader/index.tsx
new file mode 100644
index 0000000..646aa51
--- /dev/null
+++ b/packages/logos-docusaurus-theme/src/client/theme/BlogHeader/index.tsx
@@ -0,0 +1,29 @@
+import { Typography } from '@acid-info/lsd-react'
+import clsx from 'clsx'
+import React from 'react'
+import styles from './styles.module.scss'
+
+type BlogHeaderProps = {
+  title: string
+  description: string
+}
+
+export const BlogHeader = ({
+  title,
+  description,
+}: BlogHeaderProps): JSX.Element => {
+  return (
+    <div className={clsx(styles.blogHeader)}>
+      {title && (
+        <Typography variant="h3" className={clsx(styles.blogTitle)}>
+          {title}
+        </Typography>
+      )}
+      {description && (
+        <Typography variant="body2" className={clsx(styles.blogDescription)}>
+          {description}
+        </Typography>
+      )}
+    </div>
+  )
+}
diff --git a/packages/logos-docusaurus-theme/src/client/theme/BlogLayout/styles.module.scss b/packages/logos-docusaurus-theme/src/client/theme/BlogHeader/styles.module.scss
similarity index 100%
rename from packages/logos-docusaurus-theme/src/client/theme/BlogLayout/styles.module.scss
rename to packages/logos-docusaurus-theme/src/client/theme/BlogHeader/styles.module.scss
diff --git a/packages/logos-docusaurus-theme/src/client/theme/BlogLayout/index.tsx b/packages/logos-docusaurus-theme/src/client/theme/BlogLayout/index.tsx
index d3e781a..6605407 100644
--- a/packages/logos-docusaurus-theme/src/client/theme/BlogLayout/index.tsx
+++ b/packages/logos-docusaurus-theme/src/client/theme/BlogLayout/index.tsx
@@ -1,20 +1,18 @@
 import clsx from 'clsx'
 import React from 'react'
 import { Props } from '@theme/BlogLayout'
-
-import { Typography } from '@acid-info/lsd-react'
-import styles from './styles.module.scss'
 import Layout from '@theme/Layout'
 import BlogSidebar from '@theme/BlogSidebar'
 import { useBlogPageData } from './BlogPage.context'
+import { BlogHeader } from '../BlogHeader'
 
-export default function BlogLayoutWrapper(props: Props): JSX.Element {
+export default function BlogLayout(props: Props): JSX.Element {
   const { sidebar, toc, children, ...layoutProps } = props
   const { type, props: blogPageProps } = useBlogPageData()
   const isIndexPage = type === 'list'
   const hasSidebar = sidebar && sidebar.items.length > 0
-  const metadata = blogPageProps?.metadata // desstructing blogTitle & blogDescription raises an error
-  console.log('isIndexPage', isIndexPage)
+  const metadata = blogPageProps?.metadata
+
   return (
     <Layout
       {...layoutProps}
@@ -24,21 +22,10 @@ export default function BlogLayoutWrapper(props: Props): JSX.Element {
       )}
     >
       {isIndexPage && (
-        <div className={clsx(styles.blogHeader)}>
-          {metadata?.blogTitle && (
-            <Typography variant="h3" className={clsx(styles.blogTitle)}>
-              {metadata?.blogTitle}
-            </Typography>
-          )}
-          {metadata?.blogDescription && (
-            <Typography
-              variant="body2"
-              className={clsx(styles.blogDescription)}
-            >
-              {metadata?.blogDescription}
-            </Typography>
-          )}
-        </div>
+        <BlogHeader
+          title={metadata?.blogTitle}
+          description={metadata?.blogDescription}
+        />
       )}
 
       <div className="container margin-vert--lg">
diff --git a/packages/logos-docusaurus-theme/src/client/theme/BlogPostItems/index.tsx b/packages/logos-docusaurus-theme/src/client/theme/BlogPostItems/index.tsx
deleted file mode 100644
index 08aab79..0000000
--- a/packages/logos-docusaurus-theme/src/client/theme/BlogPostItems/index.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react'
-import { BlogPostProvider } from '@docusaurus/theme-common/internal'
-import BlogPostItem from '@theme/BlogPostItem'
-
-export default function BlogPostItems({
-  items,
-  component: BlogPostItemComponent = BlogPostItem,
-}) {
-  return (
-    <>
-      {items.map(({ content: BlogPostContent }) => (
-        <BlogPostProvider
-          key={BlogPostContent.metadata.permalink}
-          content={BlogPostContent}
-        >
-          <BlogPostItemComponent>
-            <BlogPostContent />
-          </BlogPostItemComponent>
-        </BlogPostProvider>
-      ))}
-    </>
-  )
-}