diff --git a/config/block.block.article_topics_facet.yml b/config/block.block.article_topics_facet.yml
index fa22f1e..0ed61be 100644
--- a/config/block.block.article_topics_facet.yml
+++ b/config/block.block.article_topics_facet.yml
@@ -27,5 +27,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: article_listing
+    context_mapping: {  }
diff --git a/config/block.block.article_type_facet.yml b/config/block.block.article_type_facet.yml
index be41018..f9adf95 100644
--- a/config/block.block.article_type_facet.yml
+++ b/config/block.block.article_type_facet.yml
@@ -27,5 +27,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: article_listing
+    context_mapping: {  }
diff --git a/config/block.block.blog_topics_facet.yml b/config/block.block.blog_topics_facet.yml
index 9b3c039..43c3813 100644
--- a/config/block.block.blog_topics_facet.yml
+++ b/config/block.block.blog_topics_facet.yml
@@ -27,5 +27,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: blog_listing
+    context_mapping: {  }
diff --git a/config/block.block.footer_about_us.yml b/config/block.block.footer_about_us.yml
index 1c1c874..47540f5 100644
--- a/config/block.block.footer_about_us.yml
+++ b/config/block.block.footer_about_us.yml
@@ -22,19 +22,19 @@ settings:
   label: 'About Us'
   label_display: visible
   provider: menu_block
-  follow: false
+  follow: 0
   follow_parent: child
-  label_link: false
-  label_type: block
   level: 1
   depth: 0
   expand_all_items: false
   parent: 'main:menu_link_content:33435872-bdbe-4833-9477-c057c2c33359'
   suggestion: main
+  label_type: block
+  label_link: false
   expand: 0
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: ''
+    context_mapping: {  }
diff --git a/config/block.block.footer_contact_info.yml b/config/block.block.footer_contact_info.yml
index 369e352..c5d2a1c 100644
--- a/config/block.block.footer_contact_info.yml
+++ b/config/block.block.footer_contact_info.yml
@@ -29,5 +29,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: ''
+    context_mapping: {  }
diff --git a/config/block.block.footer_copyleft.yml b/config/block.block.footer_copyleft.yml
index c9faccf..b7f9fd5 100644
--- a/config/block.block.footer_copyleft.yml
+++ b/config/block.block.footer_copyleft.yml
@@ -29,5 +29,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: ''
+    context_mapping: {  }
diff --git a/config/block.block.footer_get_involved.yml b/config/block.block.footer_get_involved.yml
index 0fc1932..f9742ad 100644
--- a/config/block.block.footer_get_involved.yml
+++ b/config/block.block.footer_get_involved.yml
@@ -22,19 +22,19 @@ settings:
   label: 'Get Involved'
   label_display: visible
   provider: menu_block
-  follow: false
+  follow: 0
   follow_parent: child
-  label_link: false
-  label_type: block
   level: 1
   depth: 0
   expand_all_items: false
   parent: 'main:menu_link_content:f1eaa438-620d-418b-acd3-ad00dab9c635'
   suggestion: main
+  label_type: block
+  label_link: false
   expand: 0
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: ''
+    context_mapping: {  }
diff --git a/config/block.block.footer_our_work.yml b/config/block.block.footer_our_work.yml
index 0b9ce4e..8531650 100644
--- a/config/block.block.footer_our_work.yml
+++ b/config/block.block.footer_our_work.yml
@@ -22,19 +22,19 @@ settings:
   label: 'Our Work'
   label_display: visible
   provider: menu_block
-  follow: false
+  follow: 0
   follow_parent: child
-  label_link: false
-  label_type: block
   level: 1
   depth: 0
   expand_all_items: false
   parent: 'main:menu_link_content:3f594be0-bb0f-4b30-923e-e7984983a0fd'
   suggestion: main
+  label_type: block
+  label_link: false
   expand: 0
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: ''
+    context_mapping: {  }
diff --git a/config/block.block.home_page_custom_1.yml b/config/block.block.home_page_custom_1.yml
index 962758d..351c95d 100644
--- a/config/block.block.home_page_custom_1.yml
+++ b/config/block.block.home_page_custom_1.yml
@@ -4,10 +4,7 @@ status: true
 dependencies:
   config:
     - block_visibility_groups.block_visibility_group.home_page
-  content:
-    - 'block_content:slide:a3a19121-c6a2-4a3f-8225-8e84f5fb0c9d'
   module:
-    - block_content
     - block_visibility_groups
   theme:
     - octavia
@@ -31,5 +28,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: home_page
+    context_mapping: {  }
diff --git a/config/block.block.home_page_custom_2.yml b/config/block.block.home_page_custom_2.yml
index c4c041e..9180d72 100644
--- a/config/block.block.home_page_custom_2.yml
+++ b/config/block.block.home_page_custom_2.yml
@@ -4,10 +4,7 @@ status: true
 dependencies:
   config:
     - block_visibility_groups.block_visibility_group.home_page
-  content:
-    - 'block_content:slide:8f30e41d-3693-43bc-a281-9b11e29df3b8'
   module:
-    - block_content
     - block_visibility_groups
   theme:
     - octavia
@@ -31,5 +28,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: home_page
+    context_mapping: {  }
diff --git a/config/block.block.home_page_custom_3.yml b/config/block.block.home_page_custom_3.yml
index f6c9682..8212741 100644
--- a/config/block.block.home_page_custom_3.yml
+++ b/config/block.block.home_page_custom_3.yml
@@ -4,10 +4,7 @@ status: true
 dependencies:
   config:
     - block_visibility_groups.block_visibility_group.home_page
-  content:
-    - 'block_content:slide:086d20ee-9e48-4ee3-81ae-263f7dc279ba'
   module:
-    - block_content
     - block_visibility_groups
   theme:
     - octavia
@@ -31,5 +28,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: home_page
+    context_mapping: {  }
diff --git a/config/block.block.home_page_feature.yml b/config/block.block.home_page_feature.yml
index e9d92ff..85f9515 100644
--- a/config/block.block.home_page_feature.yml
+++ b/config/block.block.home_page_feature.yml
@@ -4,10 +4,7 @@ status: true
 dependencies:
   config:
     - block_visibility_groups.block_visibility_group.home_page
-  content:
-    - 'block_content:slide:2b547200-6da3-4608-aa40-b98a6bea4933'
   module:
-    - block_content
     - block_visibility_groups
   theme:
     - octavia
@@ -34,5 +31,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: home_page
+    context_mapping: {  }
diff --git a/config/block.block.home_page_hero.yml b/config/block.block.home_page_hero.yml
index 7ede0b7..d13fed5 100644
--- a/config/block.block.home_page_hero.yml
+++ b/config/block.block.home_page_hero.yml
@@ -4,10 +4,7 @@ status: true
 dependencies:
   config:
     - block_visibility_groups.block_visibility_group.home_page
-  content:
-    - 'block_content:slide:9f7eec29-3c40-49f1-b7d9-18ff5c4eb32d'
   module:
-    - block_content
     - block_visibility_groups
   theme:
     - octavia
@@ -34,5 +31,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: home_page
+    context_mapping: {  }
diff --git a/config/block.block.octavia_credit.yml b/config/block.block.octavia_credit.yml
deleted file mode 100644
index 783741e..0000000
--- a/config/block.block.octavia_credit.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 9a7c2068-52fd-4466-9513-47b56560da71
-langcode: en
-status: true
-dependencies:
-  content:
-    - 'block_content:basic:3fd1dadf-82ba-4c57-89de-674a41df4225'
-  module:
-    - block_content
-    - block_visibility_groups
-  theme:
-    - octavia
-id: octavia_credit
-theme: octavia
-region: footer
-weight: 0
-provider: null
-plugin: 'block_content:3fd1dadf-82ba-4c57-89de-674a41df4225'
-settings:
-  id: 'block_content:3fd1dadf-82ba-4c57-89de-674a41df4225'
-  label: Credit
-  label_display: '0'
-  provider: block_content
-  status: true
-  info: ''
-  view_mode: full
-visibility:
-  condition_group:
-    id: condition_group
-    negate: false
-    block_visibility_group: ''
diff --git a/config/block.block.resource_topics_facet.yml b/config/block.block.resource_topics_facet.yml
index a4aedc8..14c0ea8 100644
--- a/config/block.block.resource_topics_facet.yml
+++ b/config/block.block.resource_topics_facet.yml
@@ -27,5 +27,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: resource_listing
+    context_mapping: {  }
diff --git a/config/block.block.resource_type_facet.yml b/config/block.block.resource_type_facet.yml
index ce13471..639fd63 100644
--- a/config/block.block.resource_type_facet.yml
+++ b/config/block.block.resource_type_facet.yml
@@ -27,5 +27,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: resource_listing
+    context_mapping: {  }
diff --git a/config/block.block.views_block__article_block_promoted.yml b/config/block.block.views_block__article_block_promoted.yml
index eef65eb..b850608 100644
--- a/config/block.block.views_block__article_block_promoted.yml
+++ b/config/block.block.views_block__article_block_promoted.yml
@@ -29,5 +29,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: home_page
+    context_mapping: {  }
diff --git a/config/block.block.views_block__blog_block_promoted.yml b/config/block.block.views_block__blog_block_promoted.yml
index aead700..6988a3e 100644
--- a/config/block.block.views_block__blog_block_promoted.yml
+++ b/config/block.block.views_block__blog_block_promoted.yml
@@ -29,5 +29,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: home_page
+    context_mapping: {  }
diff --git a/config/block.block.views_block__content_by_author_block_author.yml b/config/block.block.views_block__content_by_author_block_author.yml
index 4a86530..2a39f66 100644
--- a/config/block.block.views_block__content_by_author_block_author.yml
+++ b/config/block.block.views_block__content_by_author_block_author.yml
@@ -23,19 +23,19 @@ settings:
   label: ''
   label_display: visible
   provider: views
-  context_mapping: {  }
   views_label: ''
   items_per_page: none
+  context_mapping: {  }
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: ''
+    context_mapping: {  }
   'entity_bundle:node':
     id: 'entity_bundle:node'
+    bundles:
+      people: people
     negate: false
     context_mapping:
       node: '@node.node_route_context:node'
-    bundles:
-      people: people
diff --git a/config/block.block.views_block__related_content_block_related_content.yml b/config/block.block.views_block__related_content_block_related_content.yml
index 7e8c16b..24b545c 100644
--- a/config/block.block.views_block__related_content_block_related_content.yml
+++ b/config/block.block.views_block__related_content_block_related_content.yml
@@ -23,20 +23,20 @@ settings:
   label: ''
   label_display: visible
   provider: views
-  context_mapping: {  }
   views_label: ''
   items_per_page: none
+  context_mapping: {  }
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: ''
+    context_mapping: {  }
   'entity_bundle:node':
     id: 'entity_bundle:node'
-    negate: true
-    context_mapping:
-      node: '@node.node_route_context:node'
     bundles:
       landing_page: landing_page
       people: people
+    negate: true
+    context_mapping:
+      node: '@node.node_route_context:node'
diff --git a/config/block.block.views_block__resource_block_promoted.yml b/config/block.block.views_block__resource_block_promoted.yml
index fa0e085..3e2c322 100644
--- a/config/block.block.views_block__resource_block_promoted.yml
+++ b/config/block.block.views_block__resource_block_promoted.yml
@@ -29,5 +29,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    context_mapping: {  }
     block_visibility_group: home_page
+    context_mapping: {  }
diff --git a/config/taxonomy.vocabulary.method.yml b/config/taxonomy.vocabulary.method.yml
deleted file mode 100644
index 754f701..0000000
--- a/config/taxonomy.vocabulary.method.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 5fd9a1e0-925b-40da-8859-f448e207401d
-langcode: en
-status: true
-dependencies: {  }
-name: Method
-vid: method
-description: 'The way software or other resource goes about achieving its purpose.'
-weight: 0
diff --git a/config/taxonomy.vocabulary.purpose.yml b/config/taxonomy.vocabulary.purpose.yml
deleted file mode 100644
index 32f538c..0000000
--- a/config/taxonomy.vocabulary.purpose.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 3256d0e0-aa02-42b7-ad5c-6871595a8283
-langcode: en
-status: true
-dependencies: {  }
-name: 'Resource purpose'
-vid: purpose
-description: 'One of the reasons a particular software or other resource exists, purpose it serves.'
-weight: 0