diff --git a/README.md b/README.md
index 82bfd57..18fdc94 100644
--- a/README.md
+++ b/README.md
@@ -14,32 +14,6 @@ The Joomla Component Builder Package that bundles JCB Component and all the plug
 
 - [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [3.x](https://git.vdm.dev/joomla/Component-Builder/archive/3.x.zip)
 > 3.x
-- [joomla/plg_content_componentbuilderadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs) [3.x](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs/archive/3.x.zip)
-> 3.x
-- [joomla/plg_content_componentbuildercomponentdashboardheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs) [3.x](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs/archive/3.x.zip)
-> 3.x
-- [joomla/plg_content_componentbuildercomponentheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs) [3.x](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs/archive/3.x.zip)
-> 3.x
-- [joomla/plg_content_componentbuildercustomadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs) [3.x](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs/archive/3.x.zip)
-> 3.x
-- [joomla/plg_content_componentbuilderfieldorderingtabs](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs) [3.x](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs/archive/3.x.zip)
-> 3.x
-- [joomla/plg_content_componentbuilderlanguagetabs](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs) [3.x](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs/archive/3.x.zip)
-> 3.x
-- [joomla/plg_content_componentbuilderprivacytabs](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs) [3.x](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs/archive/3.x.zip)
-> 3.x
-- [joomla/plg_content_componentbuildersiteheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs) [3.x](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs/archive/3.x.zip)
-> 3.x
-- [joomla/plg_content_componentbuilderdynamicgetheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs) [3.x](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs/archive/3.x.zip)
-> 3.x
-- [joomla/plg_extension_componentbuilderactionlogcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler) [3.x](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler/archive/3.x.zip)
-> 3.x
-- [joomla/plg_extension_componentbuilderexportcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler) [3.x](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler/archive/3.x.zip)
-> 3.x
-- [joomla/plg_extension_componentbuilderfieldorderingcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler) [3.x](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler/archive/3.x.zip)
-> 3.x
-- [joomla/plg_extension_componentbuilderheaderscompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler) [3.x](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler/archive/3.x.zip)
-> 3.x
 - [joomla/plg_extension_componentbuilderlanguagepackaging](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging) [3.x](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging/archive/3.x.zip)
 > 3.x
 - [joomla/plg_extension_componentbuilderpowersautoloadercompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler) [3.x](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler/archive/3.x.zip)
diff --git a/pkg_component_builder.xml b/pkg_component_builder.xml
index 573de65..6dcd632 100644
--- a/pkg_component_builder.xml
+++ b/pkg_component_builder.xml
@@ -23,19 +23,6 @@
 	</languages>
 	<files folder="src">
 		<file type="component" id="com_componentbuilder">joomla__Component-Builder__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderAdminHeadersTabs" group="content">joomla__plg_content_componentbuilderadminheaderstabs__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderComponentDashboardHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentdashboardheaderstabs__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderComponentHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentheaderstabs__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderCustomAdminHeadersTabs" group="content">joomla__plg_content_componentbuildercustomadminheaderstabs__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderFieldOrderingTabs" group="content">joomla__plg_content_componentbuilderfieldorderingtabs__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderLanguageTabs" group="content">joomla__plg_content_componentbuilderlanguagetabs__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderPrivacyTabs" group="content">joomla__plg_content_componentbuilderprivacytabs__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderSiteHeadersTabs" group="content">joomla__plg_content_componentbuildersiteheaderstabs__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderDynamicgetHeadersTabs" group="content">joomla__plg_content_componentbuilderdynamicgetheaderstabs__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderActionLogCompiler" group="extension">joomla__plg_extension_componentbuilderactionlogcompiler__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderExportCompiler" group="extension">joomla__plg_extension_componentbuilderexportcompiler__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderFieldOrderingCompiler" group="extension">joomla__plg_extension_componentbuilderfieldorderingcompiler__3.x.zip</file>
-		<file type="plugin" id="ComponentBuilderHeadersCompiler" group="extension">joomla__plg_extension_componentbuilderheaderscompiler__3.x.zip</file>
 		<file type="plugin" id="ComponentBuilderLanguagePackaging" group="extension">joomla__plg_extension_componentbuilderlanguagepackaging__3.x.zip</file>
 		<file type="plugin" id="ComponentBuilderPowersAutoloaderCompiler" group="extension">joomla__plg_extension_componentbuilderpowersautoloadercompiler__3.x.zip</file>
 		<file type="plugin" id="ComponentBuilderPrivacyCompiler" group="extension">joomla__plg_extension_componentbuilderprivacycompiler__3.x.zip</file>
diff --git a/src/joomla__plg_content_componentbuilderadminheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuilderadminheaderstabs__3.x.zip
deleted file mode 100644
index e8141c8..0000000
Binary files a/src/joomla__plg_content_componentbuilderadminheaderstabs__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__3.x.zip
deleted file mode 100644
index 067416e..0000000
Binary files a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_content_componentbuildercomponentheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuildercomponentheaderstabs__3.x.zip
deleted file mode 100644
index 585a82c..0000000
Binary files a/src/joomla__plg_content_componentbuildercomponentheaderstabs__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuildercustomadminheaderstabs__3.x.zip
deleted file mode 100644
index 1c1afd9..0000000
Binary files a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__3.x.zip
deleted file mode 100644
index b6e8da2..0000000
Binary files a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_content_componentbuilderfieldorderingtabs__3.x.zip b/src/joomla__plg_content_componentbuilderfieldorderingtabs__3.x.zip
deleted file mode 100644
index 185a082..0000000
Binary files a/src/joomla__plg_content_componentbuilderfieldorderingtabs__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_content_componentbuilderlanguagetabs__3.x.zip b/src/joomla__plg_content_componentbuilderlanguagetabs__3.x.zip
deleted file mode 100644
index ed401e2..0000000
Binary files a/src/joomla__plg_content_componentbuilderlanguagetabs__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_content_componentbuilderprivacytabs__3.x.zip b/src/joomla__plg_content_componentbuilderprivacytabs__3.x.zip
deleted file mode 100644
index 49965c7..0000000
Binary files a/src/joomla__plg_content_componentbuilderprivacytabs__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_content_componentbuildersiteheaderstabs__3.x.zip b/src/joomla__plg_content_componentbuildersiteheaderstabs__3.x.zip
deleted file mode 100644
index a554359..0000000
Binary files a/src/joomla__plg_content_componentbuildersiteheaderstabs__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_extension_componentbuilderactionlogcompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderactionlogcompiler__3.x.zip
deleted file mode 100644
index 8ab4289..0000000
Binary files a/src/joomla__plg_extension_componentbuilderactionlogcompiler__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_extension_componentbuilderexportcompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderexportcompiler__3.x.zip
deleted file mode 100644
index e380a73..0000000
Binary files a/src/joomla__plg_extension_componentbuilderexportcompiler__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__3.x.zip
deleted file mode 100644
index ce3009c..0000000
Binary files a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__3.x.zip and /dev/null differ
diff --git a/src/joomla__plg_extension_componentbuilderheaderscompiler__3.x.zip b/src/joomla__plg_extension_componentbuilderheaderscompiler__3.x.zip
deleted file mode 100644
index 0d96182..0000000
Binary files a/src/joomla__plg_extension_componentbuilderheaderscompiler__3.x.zip and /dev/null differ