diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index fe97ddee..6a7d6e99 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -40,27 +40,13 @@
     <PackageReference Include="MySql.Data" Version="9.1.0" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
     <PackageReference Include="Npgsql" Version="9.0.3" />
+      <PackageReference Include="OTAPI.Upcoming" Version="3.3.4" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\TerrariaServerAPI\TerrariaServerAPI\TerrariaServerAPI.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="HttpServer">
-      <HintPath>..\prebuilts\HttpServer.dll</HintPath>
-    </Reference>
-    <Reference Include="ModFramework">
-      <HintPath>..\lib\ModFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="OTAPI">
-      <HintPath>..\lib\OTAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="OTAPI.Runtime">
-      <HintPath>..\lib\OTAPI.Runtime.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\prebuilts\HttpServer.dll">
       <Link>HttpServer.dll</Link>
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index eb541fcc..f96cb445 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit eb541fcc1e232cbd00552b866cea65ee97d0a61b
+Subproject commit f96cb445171f4816d36d1151125fc5d9e9fd9f18
diff --git a/lib/ModFramework.dll b/lib/ModFramework.dll
deleted file mode 100644
index a82e2525..00000000
Binary files a/lib/ModFramework.dll and /dev/null differ
diff --git a/lib/OTAPI.Runtime.dll b/lib/OTAPI.Runtime.dll
deleted file mode 100644
index b117f105..00000000
Binary files a/lib/OTAPI.Runtime.dll and /dev/null differ
diff --git a/lib/OTAPI.dll b/lib/OTAPI.dll
deleted file mode 100644
index acecde96..00000000
Binary files a/lib/OTAPI.dll and /dev/null differ