diff --git a/.gitmodules b/.gitmodules
index 779ee709..b0e82270 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
-[submodule "Aaru.CommonTypes"]
-	path = Aaru.CommonTypes
-	url = https://github.com/Aaru-dps/Aaru.CommonTypes
-[submodule "Aaru.Helpers"]
-	path = Aaru.Helpers
-	url = https://github.com/Aaru-dps/Aaru.Helpers
-[submodule "Aaru.Console"]
-	path = Aaru.Console
-	url = https://github.com/Aaru-dps/Aaru.Console
 [submodule "CICMMetadata"]
 	path = CICMMetadata
 	url = https://github.com/claunia/CICMMetadata
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
deleted file mode 160000
index 7fc26e86..00000000
--- a/Aaru.CommonTypes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7fc26e8678e147cf3260ccbcc0431656034fa644
diff --git a/Aaru.Console b/Aaru.Console
deleted file mode 160000
index 0eb1345d..00000000
--- a/Aaru.Console
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0eb1345d21c952fed503d62f7fd3748c2be32209
diff --git a/Aaru.Helpers b/Aaru.Helpers
deleted file mode 160000
index 65296b6c..00000000
--- a/Aaru.Helpers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 65296b6ccceeccb83c2a03d72e0a50f473664042
diff --git a/Marechai.Database/Marechai.Database.csproj b/Marechai.Database/Marechai.Database.csproj
index e9fc1a0f..60802f4e 100644
--- a/Marechai.Database/Marechai.Database.csproj
+++ b/Marechai.Database/Marechai.Database.csproj
@@ -4,6 +4,7 @@
     <RootNamespace>Marechai.Database</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Aaru.CommonTypes" Version="5.2.99.3380-alpha" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
       <PrivateAssets>all</PrivateAssets>
@@ -14,7 +15,4 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Json.Microsoft" Version="5.0.0-alpha.2" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Marechai.sln b/Marechai.sln
index c67b4422..03913011 100644
--- a/Marechai.sln
+++ b/Marechai.sln
@@ -4,12 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marechai", "Marechai\Marech
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marechai.Database", "Marechai.Database\Marechai.Database.csproj", "{F914D5B9-0C7F-4A40-B187-269B83497AF8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.CommonTypes", "Aaru.CommonTypes\Aaru.CommonTypes.csproj", "{F2B84194-26EB-4227-B1C5-6602517E85AE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Console", "Aaru.Console\Aaru.Console.csproj", "{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Helpers", "Aaru.Helpers\Aaru.Helpers.csproj", "{F8BDF57B-1571-4CD0-84B3-B422088D359A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -24,17 +18,5 @@ Global
 		{F914D5B9-0C7F-4A40-B187-269B83497AF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F914D5B9-0C7F-4A40-B187-269B83497AF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F914D5B9-0C7F-4A40-B187-269B83497AF8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal