diff --git a/meson.build b/meson.build
index 5598aca..618965a 100644
--- a/meson.build
+++ b/meson.build
@@ -163,10 +163,10 @@ sdk_includes = include_directories([
   'include/hl2sdk/public/engine',
   'include/hl2sdk/public/game/client',
   'include/hl2sdk/public/game/server',
+  'include/hl2sdk/public/mathlib',
   'include/hl2sdk/public/tier0',
   'include/hl2sdk/public/tier1',
-  'include/hl2sdk/public/tier2',
-  'include/hl2sdk/public/tier3',
+  'include/hl2sdk/public/vstdlib',
 ])
 
 # SDK libraries
@@ -178,8 +178,6 @@ if host_system == 'windows'
       cpp.find_library('mathlib', dirs: [dir_x86], required: true),
       cpp.find_library('tier0', dirs: [dir_x86], required: true),
       cpp.find_library('tier1', dirs: [dir_x86], required: true),
-      cpp.find_library('tier2', dirs: [dir_x86], required: true),
-      cpp.find_library('tier3', dirs: [dir_x86], required: true),
       cpp.find_library('vstdlib', dirs: [dir_x86], required: true),
     ]
   elif arch == 'x64'
@@ -197,20 +195,18 @@ elif host_system == 'linux'
   if arch == 'x86'
     dir_x86 = join_paths(meson.current_source_dir(), 'include/hl2sdk/lib/linux')
     sdk_deps += [
-      cpp.find_library('tier0_srv', dirs: [dir_x86], required: true),
-      cpp.find_library('vstdlib_srv', dirs: [dir_x86], required: true),
       cpp.find_library('mathlib_i486', dirs: [dir_x86], required: true),
+      cpp.find_library('tier0_srv', dirs: [dir_x86], required: true),
       cpp.find_library('tier1_i486', dirs: [dir_x86], required: true),
-      cpp.find_library('tier2_i486', dirs: [dir_x86], required: true),
-      cpp.find_library('tier3_i486', dirs: [dir_x86], required: true),
+      cpp.find_library('vstdlib_srv', dirs: [dir_x86], required: true),
     ]
   elif arch == 'x64'
     dir_x64 = join_paths(meson.current_source_dir(), 'include/hl2sdk/lib/linux64')
     sdk_deps += [
-      cpp.find_library('tier0_srv', dirs: [dir_x64], required: true),
-      cpp.find_library('vstdlib_srv', dirs: [dir_x64], required: true),
       cpp.find_library('mathlib', dirs: [dir_x64], required: true),
+      cpp.find_library('tier0_srv', dirs: [dir_x64], required: true),
       cpp.find_library('tier1', dirs: [dir_x64], required: true),
+      cpp.find_library('vstdlib_srv', dirs: [dir_x64], required: true),
     ]
   else
     error('Unsupported host system "@0@" and arch "@1@" for libraries')
diff --git a/src/ServerPlugin.cpp b/src/ServerPlugin.cpp
index 1402915..709706d 100644
--- a/src/ServerPlugin.cpp
+++ b/src/ServerPlugin.cpp
@@ -1,6 +1,5 @@
 #include "ServerPlugin.h"
 #include "tier1.h"
-#include "tier2.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -16,7 +15,6 @@ EXPOSE_SINGLE_INTERFACE_GLOBALVAR(
 bool ServerPlugin::Load(CreateInterfaceFn engineFactory, CreateInterfaceFn serverFactory)
 {
     ConnectTier1Libraries(&engineFactory, 1);
-    // ConnectTier2Libraries(&engineFactory, 1);
 
     m_engineInterfaces = EngineInterfaces(engineFactory, serverFactory);
     if (!m_engineInterfaces.IsValid())
@@ -45,7 +43,6 @@ void ServerPlugin::Unload()
     }
 
     ConVar_Unregister();
-    // DisconnectTier2Libraries();
     DisconnectTier1Libraries();
 }