diff --git a/sources-docs.js b/sources-docs.js
index 0c4a968f..e16dda0e 100644
--- a/sources-docs.js
+++ b/sources-docs.js
@@ -63,15 +63,6 @@ module.exports = [
       patterns: 'docs/en/!(userguide)/**'
     }
   },
-  {
-    resolve: 'gatsby-source-git',
-    options: {
-      name: 'docs--6--optional_features/mfa/authenticators/webauthn-authenticator',
-      remote: 'https://github.com/silverstripe/silverstripe-webauthn-authenticator.git',
-      branch: '6',
-      patterns: 'docs/en/!(userguide)/**'
-    }
-  },
   {
     resolve: 'gatsby-source-git',
     options: {
diff --git a/sources-user.js b/sources-user.js
index dfd9f109..777b3d7b 100644
--- a/sources-user.js
+++ b/sources-user.js
@@ -27,33 +27,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--optional_features/online_databases_and_registries`,
-      remote: `https://github.com/silverstripe/silverstripe-registry`,
-      branch: `4`,
-      patterns: `docs/en/userguide/**`
-    }
-  },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--optional_features/content_review`,
-      remote: `https://github.com/silverstripe/silverstripe-contentreview`,
-      branch: `6`,
-      patterns: `docs/en/userguide/**`
-    }
-  },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--optional_features/blogs`,
-      remote: `https://github.com/silverstripe/silverstripe-blog`,
-      branch: `5`,
-      patterns: `docs/en/userguide/**`
-    }
-  },
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -63,15 +36,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--optional_features/working_with_multiple_websites`,
-      remote: `https://github.com/silverstripe/silverstripe-subsites`,
-      branch: `4`,
-      patterns: `docs/en/userguide/**`
-    }
-  },
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -81,24 +45,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--optional_features/iframe`,
-      remote: `https://github.com/silverstripe/silverstripe-iframe`,
-      branch: `4`,
-      patterns: `docs/en/userguide/**`
-    }
-  },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--optional_features/site_wide_rss_feeds`,
-      remote: `https://github.com/silverstripe/silverstripe-versionfeed`,
-      branch: `4`,
-      patterns: `docs/en/userguide/**`
-    }
-  },
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -108,15 +54,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--optional_features/modules_report`,
-      remote: `https://github.com/bringyourownideas/silverstripe-maintenance`,
-      branch: `4`,
-      patterns: `docs/en/userguide/**`
-    }
-  },
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -126,15 +63,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--optional_features/document_converter`,
-      remote: `https://github.com/silverstripe/silverstripe-documentconverter`,
-      branch: `4`,
-      patterns: `docs/en/userguide/**`
-    }
-  },
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -144,24 +72,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--managing_your_website/reports/security_report`,
-      remote: `https://github.com/silverstripe/silverstripe-securityreport`,
-      branch: `4`,
-      patterns: `docs/en/userguide/**`,
-    }
-  },
-  {
-    resolve: `gatsby-source-git`,
-    options: {
-      name: `user--6--managing_your_website/reports/sitewide_content_report`,
-      remote: `https://github.com/silverstripe/silverstripe-sitewidecontent-report`,
-      branch: `5`,
-      patterns: `docs/en/userguide/**`,
-    }
-  },
   {
     resolve: `gatsby-source-git`,
     options: {
@@ -171,7 +81,6 @@ module.exports = [
       patterns: `docs/en/userguide/**`
     }
   },
-
   // v5
   {
     resolve: `gatsby-source-git`,