diff --git a/src/_includes/schemas/blogpost-schema.njk b/src/_includes/schemas/blogpost-schema.njk
index c2aef31..fcb3db7 100644
--- a/src/_includes/schemas/blogpost-schema.njk
+++ b/src/_includes/schemas/blogpost-schema.njk
@@ -11,16 +11,16 @@
     "@id": "{{ url }}",
     "headline": "{{ title or meta.siteName }}",
     "description": "{{ seo.description or description or meta.siteDescription }}",
-    "image": "{% if seo.image %}/assets/images/{{ seo.image }}{% else %}{{ meta.siteImage }}{% endif %}",
+    "image": "{{ meta.url }}{% if seo.image %}/assets/images/{{ seo.image }}{% else %}{{ meta.meta_data.opengraph_default }}{% endif %}",
     "inLanguage": "{{ meta.locale }}",
     "publisher": {
       "@type": "{{ meta.siteType }}",
-      "name": "{{ meta.authorName }}",
+      "name": "{{ meta.author }}",
       "url": "{{ meta.url }}"
     },
     "author": {
       "@type": "Person",
-      "name": "{{ meta.authorName }}"
+      "name": "{{ meta.author }}"
     },
     "datePublished": "{{ date | toIsoString }}"
   }
diff --git a/src/_includes/schemas/event-schema.njk b/src/_includes/schemas/event-schema.njk
deleted file mode 100644
index 66a83c7..0000000
--- a/src/_includes/schemas/event-schema.njk
+++ /dev/null
@@ -1,21 +0,0 @@
-<script type="application/ld+json">
-  {
-    "@context": "http://schema.org",
-    "@type": "Event",
-    "@id": "{{ url }}",
-    "location": {
-      "@type": "Place",
-      "address": {
-        "@type": "PostalAddress",
-        "addressLocality": "{{ location }}"
-      },
-      "name": "{{ location }}"
-    },
-    "name": "{{ title }}",
-    "description": "{{ description }}",
-    "startDate": "{{ date  }}",
-    "endDate": "{{ ending  }}",
-    "performer": "{{ artist  }}",
-    "organizer": "{{ meta.siteName }}"
-  }
-</script>
diff --git a/src/_includes/schemas/page-schema.njk b/src/_includes/schemas/page-schema.njk
deleted file mode 100644
index c71a485..0000000
--- a/src/_includes/schemas/page-schema.njk
+++ /dev/null
@@ -1,20 +0,0 @@
-<script type="application/ld+json">
-  {
-    "@type": "WebPage",
-    "mainEntityOfPage": {
-      "@type": "WebPage"
-    },
-    "isPartOf": {
-      "@id": "{{ meta.url }}#website"
-    },
-    "headline": "{{ title or meta.siteName }}",
-    "description": "{{ seo.description or description or meta.siteDescription }}",
-    "image": "{% if seo.image %}/assets/images/{{ seo.image }}{% else %}{{ meta.siteImage }}{% endif %}",
-    "inLanguage": "{{ meta.locale }}",
-    "publisher": {
-      "@type": "{{ meta.siteType }}",
-      "name": "{{ meta.authorName }}",
-      "url": "{{ meta.url }}"
-    }
-  }
-</script>