From 809e66cdb1124b5d6cff70f53173c275187b1c55 Mon Sep 17 00:00:00 2001
From: FutureRave <edoardo.sanguineti222@gmail.com>
Date: Wed, 16 Mar 2022 00:44:59 +0000
Subject: [PATCH] Remove unnecessary deconstructors

---
 src/Components/Modules/Bans.cpp            |  5 -----
 src/Components/Modules/Bans.hpp            |  1 -
 src/Components/Modules/CardTitles.cpp      |  8 --------
 src/Components/Modules/CardTitles.hpp      |  1 -
 src/Components/Modules/Changelog.cpp       |  8 --------
 src/Components/Modules/Changelog.hpp       |  1 -
 src/Components/Modules/Chat.cpp            |  5 -----
 src/Components/Modules/Chat.hpp            |  1 -
 src/Components/Modules/Clantags.cpp        |  8 --------
 src/Components/Modules/Clantags.hpp        |  1 -
 src/Components/Modules/ClientCommand.cpp   |  5 -----
 src/Components/Modules/ClientCommand.hpp   |  2 +-
 src/Components/Modules/Command.cpp         |  6 ------
 src/Components/Modules/Command.hpp         |  2 +-
 src/Components/Modules/Dedicated.cpp       |  5 -----
 src/Components/Modules/Dedicated.hpp       |  1 -
 src/Components/Modules/Discovery.cpp       |  5 -----
 src/Components/Modules/Discovery.hpp       |  1 -
 src/Components/Modules/Elevators.cpp       |  4 ----
 src/Components/Modules/Elevators.hpp       |  1 -
 src/Components/Modules/FastFiles.cpp       |  5 -----
 src/Components/Modules/FastFiles.hpp       |  1 -
 src/Components/Modules/Flags.cpp           |  4 ----
 src/Components/Modules/Flags.hpp           |  2 +-
 src/Components/Modules/Menus.cpp           |  1 -
 src/Components/Modules/ModList.cpp         |  5 -----
 src/Components/Modules/ModList.hpp         |  1 -
 src/Components/Modules/MusicalTalent.cpp   |  5 -----
 src/Components/Modules/MusicalTalent.hpp   |  1 -
 src/Components/Modules/Network.cpp         |  7 -------
 src/Components/Modules/Network.hpp         |  1 -
 src/Components/Modules/Party.cpp           |  5 -----
 src/Components/Modules/Party.hpp           |  1 -
 src/Components/Modules/Playlist.cpp        |  7 -------
 src/Components/Modules/Playlist.hpp        |  1 -
 src/Components/Modules/RCon.cpp            |  5 -----
 src/Components/Modules/RCon.hpp            |  1 -
 src/Components/Modules/Script.cpp          |  8 --------
 src/Components/Modules/ServerCommands.cpp  |  5 -----
 src/Components/Modules/ServerCommands.hpp  |  1 -
 src/Components/Modules/ServerList.cpp      | 13 +++----------
 src/Components/Modules/StartupMessages.cpp |  5 -----
 src/Components/Modules/StartupMessages.hpp |  1 -
 src/Components/Modules/Stats.cpp           |  5 -----
 src/Components/Modules/Stats.hpp           |  1 -
 src/Components/Modules/StringTable.cpp     |  5 -----
 src/Components/Modules/StringTable.hpp     |  1 -
 src/Components/Modules/StructuredData.cpp  |  5 -----
 src/Components/Modules/StructuredData.hpp  |  1 -
 src/Components/Modules/Zones.cpp           |  5 -----
 src/Components/Modules/Zones.hpp           |  1 -
 51 files changed, 6 insertions(+), 175 deletions(-)

diff --git a/src/Components/Modules/Bans.cpp b/src/Components/Modules/Bans.cpp
index 38cd20e9..6310ef5c 100644
--- a/src/Components/Modules/Bans.cpp
+++ b/src/Components/Modules/Bans.cpp
@@ -274,9 +274,4 @@ namespace Components
 			Bans::LoadBans(&list);
 		});
 	}
-
-	Bans::~Bans()
-	{
-
-	}
 }
diff --git a/src/Components/Modules/Bans.hpp b/src/Components/Modules/Bans.hpp
index 1ba76a66..fe5c6410 100644
--- a/src/Components/Modules/Bans.hpp
+++ b/src/Components/Modules/Bans.hpp
@@ -8,7 +8,6 @@ namespace Components
 		typedef std::pair<SteamID, Game::netIP_t> Entry;
 
 		Bans();
-		~Bans();
 
 		static void BanClientNum(int num, const std::string& reason);
 		static void UnbanClient(SteamID id);
diff --git a/src/Components/Modules/CardTitles.cpp b/src/Components/Modules/CardTitles.cpp
index 471dd8ec..5afb8a8b 100644
--- a/src/Components/Modules/CardTitles.cpp
+++ b/src/Components/Modules/CardTitles.cpp
@@ -227,12 +227,4 @@ namespace Components
         AntiCheat::CheckStartupTime();
 #endif
 	}
-
-	CardTitles::~CardTitles()
-	{
-		for (int i = 0; i < ARRAYSIZE(CardTitles::CustomTitles); ++i)
-		{
-			CardTitles::CustomTitles[i].clear();
-		}
-	}
 }
diff --git a/src/Components/Modules/CardTitles.hpp b/src/Components/Modules/CardTitles.hpp
index 7f838ef8..0b43bdab 100644
--- a/src/Components/Modules/CardTitles.hpp
+++ b/src/Components/Modules/CardTitles.hpp
@@ -60,7 +60,6 @@ namespace Components
 		static void ParseCustomTitles(const char * msg);
 
 		CardTitles();
-		~CardTitles();
 
 	private:
 		static CClient * GetClientByIndex(std::uint32_t index);
diff --git a/src/Components/Modules/Changelog.cpp b/src/Components/Modules/Changelog.cpp
index 28773007..a6da0d83 100644
--- a/src/Components/Modules/Changelog.cpp
+++ b/src/Components/Modules/Changelog.cpp
@@ -60,12 +60,4 @@ namespace Components
 		Scheduler::OnFrameAsync(AntiCheat::QuickCodeScanner1);
 #endif
 	}
-
-	Changelog::~Changelog()
-	{
-		{
-			std::lock_guard<std::mutex> _(Changelog::Mutex);
-			Changelog::Lines.clear();
-		}
-	}
 }
diff --git a/src/Components/Modules/Changelog.hpp b/src/Components/Modules/Changelog.hpp
index dd74a8be..b58eb1ca 100644
--- a/src/Components/Modules/Changelog.hpp
+++ b/src/Components/Modules/Changelog.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		Changelog();
-		~Changelog();
 
 		static void LoadChangelog();
 
diff --git a/src/Components/Modules/Chat.cpp b/src/Components/Modules/Chat.cpp
index abe117d8..0300d56c 100644
--- a/src/Components/Modules/Chat.cpp
+++ b/src/Components/Modules/Chat.cpp
@@ -328,9 +328,4 @@ namespace Components
 		// Change logic that does word splitting with new lines for chat messages to support fonticons
 		Utils::Hook(0x592E10, CG_AddToTeamChat_Stub, HOOK_JUMP).install()->quick();
 	}
-
-	Chat::~Chat()
-	{
-		Chat::MuteList.clear();
-	}
 }
diff --git a/src/Components/Modules/Chat.hpp b/src/Components/Modules/Chat.hpp
index 62bc36aa..134efb37 100644
--- a/src/Components/Modules/Chat.hpp
+++ b/src/Components/Modules/Chat.hpp
@@ -7,7 +7,6 @@ namespace Components
 		static constexpr auto FONT_ICON_CHAT_WIDTH_CALCULATION_MULTIPLIER = 2.0f;
 	public:
 		Chat();
-		~Chat();
 
 	private:
 		static Game::dvar_t** cg_chatHeight;
diff --git a/src/Components/Modules/Clantags.cpp b/src/Components/Modules/Clantags.cpp
index ff6e2022..e2d03cf6 100644
--- a/src/Components/Modules/Clantags.cpp
+++ b/src/Components/Modules/Clantags.cpp
@@ -101,12 +101,4 @@ namespace Components
 		// Draw clantag before playername
 		Utils::Hook(0x591242, ClanTags::DrawPlayerNameOnScoreboard).install()->quick();
 	}
-
-	ClanTags::~ClanTags()
-	{
-		for (int i = 0; i < ARRAYSIZE(ClanTags::Tags); ++i)
-		{
-			ClanTags::Tags[i].clear();
-		}
-	}
 }
diff --git a/src/Components/Modules/Clantags.hpp b/src/Components/Modules/Clantags.hpp
index caadbe69..ea7bca39 100644
--- a/src/Components/Modules/Clantags.hpp
+++ b/src/Components/Modules/Clantags.hpp
@@ -10,7 +10,6 @@ namespace Components
 		static const char* GetUserClantag(std::uint32_t clientnum, const char * playername);
 
 		ClanTags();
-		~ClanTags();
 
 	private:
 		static std::string Tags[18];
diff --git a/src/Components/Modules/ClientCommand.cpp b/src/Components/Modules/ClientCommand.cpp
index 1c0c7fa4..bc0a202f 100644
--- a/src/Components/Modules/ClientCommand.cpp
+++ b/src/Components/Modules/ClientCommand.cpp
@@ -309,9 +309,4 @@ namespace Components
 		ClientCommand::AddCheatCommands();
 		ClientCommand::AddScriptFunctions();
 	}
-
-	ClientCommand::~ClientCommand()
-	{
-		ClientCommand::FunctionMap.clear();
-	}
 }
diff --git a/src/Components/Modules/ClientCommand.hpp b/src/Components/Modules/ClientCommand.hpp
index 3c1d1da6..ca9bc2a3 100644
--- a/src/Components/Modules/ClientCommand.hpp
+++ b/src/Components/Modules/ClientCommand.hpp
@@ -8,7 +8,7 @@ namespace Components
 		typedef void(Callback)(Game::gentity_s* entity);
 
 		ClientCommand();
-		~ClientCommand();
+
 		static void Add(const char* name, Utils::Slot<Callback> callback);
 		static bool CheatsOk(const Game::gentity_s* ent);
 
diff --git a/src/Components/Modules/Command.cpp b/src/Components/Modules/Command.cpp
index d3846df5..b0d30727 100644
--- a/src/Components/Modules/Command.cpp
+++ b/src/Components/Modules/Command.cpp
@@ -168,10 +168,4 @@ namespace Components
 			}
 		});
 	}
-
-	Command::~Command()
-	{
-		Command::FunctionMap.clear();
-		Command::FunctionMapSV.clear();
-	}
 }
diff --git a/src/Components/Modules/Command.hpp b/src/Components/Modules/Command.hpp
index 4e07ba87..1b6ccc6d 100644
--- a/src/Components/Modules/Command.hpp
+++ b/src/Components/Modules/Command.hpp
@@ -10,6 +10,7 @@ namespace Components
 		public:
 			Params() {};
 			virtual ~Params() {};
+
 			virtual const char* get(size_t index) = 0;
 			virtual size_t length() = 0;
 
@@ -48,7 +49,6 @@ namespace Components
 		typedef void(Callback)(Command::Params* params);
 
 		Command();
-		~Command();
 
 		static Game::cmd_function_t* Allocate();
 
diff --git a/src/Components/Modules/Dedicated.cpp b/src/Components/Modules/Dedicated.cpp
index 3e615dab..813621d6 100644
--- a/src/Components/Modules/Dedicated.cpp
+++ b/src/Components/Modules/Dedicated.cpp
@@ -519,9 +519,4 @@ namespace Components
 			}
 		});
 	}
-
-	Dedicated::~Dedicated()
-	{
-
-	}
 }
diff --git a/src/Components/Modules/Dedicated.hpp b/src/Components/Modules/Dedicated.hpp
index 78126922..cfcbc539 100644
--- a/src/Components/Modules/Dedicated.hpp
+++ b/src/Components/Modules/Dedicated.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		Dedicated();
-		~Dedicated();
 
 		static SteamID PlayerGuids[18][2];
 
diff --git a/src/Components/Modules/Discovery.cpp b/src/Components/Modules/Discovery.cpp
index 758ef317..9b3e94ef 100644
--- a/src/Components/Modules/Discovery.cpp
+++ b/src/Components/Modules/Discovery.cpp
@@ -95,11 +95,6 @@ namespace Components
 #endif
 	}
 
-	Discovery::~Discovery()
-	{
-
-	}
-
 	void Discovery::preDestroy()
 	{
 		Discovery::IsPerforming = false;
diff --git a/src/Components/Modules/Discovery.hpp b/src/Components/Modules/Discovery.hpp
index 655122bf..63f69b1b 100644
--- a/src/Components/Modules/Discovery.hpp
+++ b/src/Components/Modules/Discovery.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		Discovery();
-		~Discovery();
 
 		void preDestroy() override;
 
diff --git a/src/Components/Modules/Elevators.cpp b/src/Components/Modules/Elevators.cpp
index 9438f9ce..bb998410 100644
--- a/src/Components/Modules/Elevators.cpp
+++ b/src/Components/Modules/Elevators.cpp
@@ -120,8 +120,4 @@ namespace Components
 		Utils::Hook(0x570E0B, Elevators::PM_Trace_Hk, HOOK_CALL).install()->quick();
 		Utils::Hook(0x570D70, Elevators::PM_Trace_Hk, HOOK_CALL).install()->quick();
 	}
-
-	Elevators::~Elevators()
-	{
-	}
 }
diff --git a/src/Components/Modules/Elevators.hpp b/src/Components/Modules/Elevators.hpp
index 02b0b64e..1a096161 100644
--- a/src/Components/Modules/Elevators.hpp
+++ b/src/Components/Modules/Elevators.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		Elevators();
-		~Elevators();
 
 	private:
 		enum ElevatorSettings { DISABLED, ENABLED, EASY };
diff --git a/src/Components/Modules/FastFiles.cpp b/src/Components/Modules/FastFiles.cpp
index 2170e3c6..dbeeb667 100644
--- a/src/Components/Modules/FastFiles.cpp
+++ b/src/Components/Modules/FastFiles.cpp
@@ -622,9 +622,4 @@ namespace Components
 		}, HOOK_CALL).install()/*->quick()*/;
 #endif
 	}
-
-	FastFiles::~FastFiles()
-	{
-		FastFiles::ZonePaths.clear();
-	}
 }
diff --git a/src/Components/Modules/FastFiles.hpp b/src/Components/Modules/FastFiles.hpp
index 38c3e62c..a1b4c235 100644
--- a/src/Components/Modules/FastFiles.hpp
+++ b/src/Components/Modules/FastFiles.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		FastFiles();
-		~FastFiles();
 
 		static void AddZonePath(const std::string& path);
 		static std::string Current();
diff --git a/src/Components/Modules/Flags.cpp b/src/Components/Modules/Flags.cpp
index e3139910..0ae96615 100644
--- a/src/Components/Modules/Flags.cpp
+++ b/src/Components/Modules/Flags.cpp
@@ -53,8 +53,4 @@ namespace Components
 			Flags::EnabledFlags.push_back("stdout");
 		}
 	}
-
-	Flags::Flags()
-	{
-	}
 }
diff --git a/src/Components/Modules/Flags.hpp b/src/Components/Modules/Flags.hpp
index ec35f350..b8ee410d 100644
--- a/src/Components/Modules/Flags.hpp
+++ b/src/Components/Modules/Flags.hpp
@@ -5,7 +5,7 @@ namespace Components
 	class Flags : public Component
 	{
 	public:
-		Flags();
+		Flags() = default;
 
 		static bool HasFlag(const std::string& flag);
 
diff --git a/src/Components/Modules/Menus.cpp b/src/Components/Modules/Menus.cpp
index 9f7faa12..b6c95ea9 100644
--- a/src/Components/Modules/Menus.cpp
+++ b/src/Components/Modules/Menus.cpp
@@ -913,7 +913,6 @@ namespace Components
 
 	Menus::~Menus()
 	{
-		Menus::CustomMenus.clear();
 		Menus::FreeEverything();
 	}
 }
diff --git a/src/Components/Modules/ModList.cpp b/src/Components/Modules/ModList.cpp
index 8935b586..944aa7b4 100644
--- a/src/Components/Modules/ModList.cpp
+++ b/src/Components/Modules/ModList.cpp
@@ -101,9 +101,4 @@ namespace Components
 
 		UIFeeder::Add(9.0f, ModList::GetItemCount, ModList::GetItemText, ModList::Select);
 	}
-
-	ModList::~ModList()
-	{
-		ModList::Mods.clear();
-	}
 }
diff --git a/src/Components/Modules/ModList.hpp b/src/Components/Modules/ModList.hpp
index a871fb45..185aaed1 100644
--- a/src/Components/Modules/ModList.hpp
+++ b/src/Components/Modules/ModList.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		ModList();
-		~ModList();
 
 		static void RunMod(const std::string& mod);
 
diff --git a/src/Components/Modules/MusicalTalent.cpp b/src/Components/Modules/MusicalTalent.cpp
index 7deef61c..9769fcb6 100644
--- a/src/Components/Modules/MusicalTalent.cpp
+++ b/src/Components/Modules/MusicalTalent.cpp
@@ -39,9 +39,4 @@ namespace Components
 
 		MusicalTalent::Replace("music_mainmenu_mp", "hz_t_menumusic.mp3");
 	}
-
-	MusicalTalent::~MusicalTalent()
-	{
-		MusicalTalent::SoundAliasList.clear();
-	}
 }
diff --git a/src/Components/Modules/MusicalTalent.hpp b/src/Components/Modules/MusicalTalent.hpp
index e5bfc181..9d10d3d9 100644
--- a/src/Components/Modules/MusicalTalent.hpp
+++ b/src/Components/Modules/MusicalTalent.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		MusicalTalent();
-		~MusicalTalent();
 
 		static void Replace(const std::string& sound, const char* file);
 
diff --git a/src/Components/Modules/Network.cpp b/src/Components/Modules/Network.cpp
index 18132d2b..cd573569 100644
--- a/src/Components/Modules/Network.cpp
+++ b/src/Components/Modules/Network.cpp
@@ -403,11 +403,4 @@ namespace Components
 			Network::SendRaw(address, address.getString());
 		});
 	}
-
-	Network::~Network()
-	{
-		Network::SelectedPacket.clear();
-		Network::PacketHandlers.clear();
-		Network::StartupSignal.clear();
-	}
 }
diff --git a/src/Components/Modules/Network.hpp b/src/Components/Modules/Network.hpp
index f3248817..f3096350 100644
--- a/src/Components/Modules/Network.hpp
+++ b/src/Components/Modules/Network.hpp
@@ -52,7 +52,6 @@ namespace Components
 		typedef void(CallbackRaw)();
 
 		Network();
-		~Network();
 
 		static unsigned short GetPort();
 
diff --git a/src/Components/Modules/Party.cpp b/src/Components/Modules/Party.cpp
index afa418ad..f4bb851e 100644
--- a/src/Components/Modules/Party.cpp
+++ b/src/Components/Modules/Party.cpp
@@ -513,9 +513,4 @@ namespace Components
 			Friends::UpdateServer(address, info.get("hostname"), info.get("mapname"));
 		});
 	}
-
-	Party::~Party()
-	{
-		Party::LobbyMap.clear();
-	}
 }
diff --git a/src/Components/Modules/Party.hpp b/src/Components/Modules/Party.hpp
index 974bdc2f..d8f70cf1 100644
--- a/src/Components/Modules/Party.hpp
+++ b/src/Components/Modules/Party.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		Party();
-		~Party();
 
 		static Network::Address Target();
 		static void Connect(Network::Address target);
diff --git a/src/Components/Modules/Playlist.cpp b/src/Components/Modules/Playlist.cpp
index e413d534..f2291ebc 100644
--- a/src/Components/Modules/Playlist.cpp
+++ b/src/Components/Modules/Playlist.cpp
@@ -190,11 +190,4 @@ namespace Components
 		Network::Handle("playlistResponse", PlaylistReponse);
 		Network::Handle("playlistInvalidPassword", PlaylistInvalidPassword);
 	}
-
-	Playlist::~Playlist()
-	{
-		Playlist::MapRelocation.clear();
-		Playlist::CurrentPlaylistBuffer.clear();
-		Playlist::ReceivedPlaylistBuffer.clear();
-	}
 }
diff --git a/src/Components/Modules/Playlist.hpp b/src/Components/Modules/Playlist.hpp
index c586815f..d8e7a8fb 100644
--- a/src/Components/Modules/Playlist.hpp
+++ b/src/Components/Modules/Playlist.hpp
@@ -8,7 +8,6 @@ namespace Components
 		typedef void(*Callback)();
 
 		Playlist();
-		~Playlist();
 
 		static void LoadPlaylist();
 
diff --git a/src/Components/Modules/RCon.cpp b/src/Components/Modules/RCon.cpp
index 1ab6fc59..5412ec43 100644
--- a/src/Components/Modules/RCon.cpp
+++ b/src/Components/Modules/RCon.cpp
@@ -173,9 +173,4 @@ namespace Components
 			}
 		});
 	}
-
-	RCon::~RCon()
-	{
-		RCon::Password.clear();
-	}
 }
diff --git a/src/Components/Modules/RCon.hpp b/src/Components/Modules/RCon.hpp
index 1cc486e5..de09bbae 100644
--- a/src/Components/Modules/RCon.hpp
+++ b/src/Components/Modules/RCon.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		RCon();
-		~RCon();
 
 	private:
 		class Container
diff --git a/src/Components/Modules/Script.cpp b/src/Components/Modules/Script.cpp
index 42b9037c..5dc331a3 100644
--- a/src/Components/Modules/Script.cpp
+++ b/src/Components/Modules/Script.cpp
@@ -705,14 +705,6 @@ namespace Components
 
 	Script::~Script()
 	{
-		Script::ScriptName.clear();
-		Script::ScriptHandles.clear();
-		Script::ScriptNameStack.clear();
-		Script::ScriptFunctions.clear();
-		Script::ReplacedFunctions.clear();
 		Script::VMShutdownSignal.clear();
-
-		Script::ScriptStorage.clear();
-		Script::ScriptBaseProgramNum.clear();
 	}
 }
diff --git a/src/Components/Modules/ServerCommands.cpp b/src/Components/Modules/ServerCommands.cpp
index 471b32a6..7f47e086 100644
--- a/src/Components/Modules/ServerCommands.cpp
+++ b/src/Components/Modules/ServerCommands.cpp
@@ -65,9 +65,4 @@ namespace Components
 		// Server command receive hook
 		Utils::Hook(0x59449F, ServerCommands::OnServerCommandStub).install()->quick();
 	}
-
-	ServerCommands::~ServerCommands()
-	{
-		ServerCommands::Commands.clear();
-	}
 }
diff --git a/src/Components/Modules/ServerCommands.hpp b/src/Components/Modules/ServerCommands.hpp
index 8fc22459..61f823a6 100644
--- a/src/Components/Modules/ServerCommands.hpp
+++ b/src/Components/Modules/ServerCommands.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		ServerCommands();
-		~ServerCommands();
 
 		static void OnCommand(std::int32_t cmd, Utils::Slot<bool(Command::Params*)> cb);
 
diff --git a/src/Components/Modules/ServerList.cpp b/src/Components/Modules/ServerList.cpp
index 94c3e473..4ddfa993 100644
--- a/src/Components/Modules/ServerList.cpp
+++ b/src/Components/Modules/ServerList.cpp
@@ -880,15 +880,8 @@ namespace Components
 
 	ServerList::~ServerList()
 	{
-		ServerList::OnlineList.clear();
-		ServerList::OfflineList.clear();
-		ServerList::FavouriteList.clear();
-		ServerList::VisibleList.clear();
-
-		{
-			std::lock_guard<std::recursive_mutex> _(ServerList::RefreshContainer.mutex);
-			ServerList::RefreshContainer.awatingList = false;
-			ServerList::RefreshContainer.servers.clear();
-		}
+		std::lock_guard<std::recursive_mutex> _(ServerList::RefreshContainer.mutex);
+		ServerList::RefreshContainer.awatingList = false;
+		ServerList::RefreshContainer.servers.clear();
 	}
 }
diff --git a/src/Components/Modules/StartupMessages.cpp b/src/Components/Modules/StartupMessages.cpp
index 16cf8497..c274ecfb 100644
--- a/src/Components/Modules/StartupMessages.cpp
+++ b/src/Components/Modules/StartupMessages.cpp
@@ -34,11 +34,6 @@ namespace Components
 		});
 	}
 
-	StartupMessages::~StartupMessages()
-	{
-		StartupMessages::MessageList.clear();
-	}
-
 	void StartupMessages::AddMessage(const std::string& message)
 	{
 		StartupMessages::MessageList.push_back(message);
diff --git a/src/Components/Modules/StartupMessages.hpp b/src/Components/Modules/StartupMessages.hpp
index 6ecf3cbe..7680c77a 100644
--- a/src/Components/Modules/StartupMessages.hpp
+++ b/src/Components/Modules/StartupMessages.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		StartupMessages();
-		~StartupMessages();
 
 		static void AddMessage(const std::string& message);
 
diff --git a/src/Components/Modules/Stats.cpp b/src/Components/Modules/Stats.cpp
index cdfab8c9..dc807c37 100644
--- a/src/Components/Modules/Stats.cpp
+++ b/src/Components/Modules/Stats.cpp
@@ -107,9 +107,4 @@ namespace Components
 		// Write stats to mod folder if a mod is loaded
 		Utils::Hook(0x682F7B, Stats::SaveStats, HOOK_CALL).install()->quick();
 	}
-
-	Stats::~Stats()
-	{
-
-	}
 }
diff --git a/src/Components/Modules/Stats.hpp b/src/Components/Modules/Stats.hpp
index 6fa5be2c..c4de9fd9 100644
--- a/src/Components/Modules/Stats.hpp
+++ b/src/Components/Modules/Stats.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		Stats();
-		~Stats();
 
 		static bool IsMaxLevel();
 
diff --git a/src/Components/Modules/StringTable.cpp b/src/Components/Modules/StringTable.cpp
index 3fd00880..8f1d590d 100644
--- a/src/Components/Modules/StringTable.cpp
+++ b/src/Components/Modules/StringTable.cpp
@@ -76,9 +76,4 @@ namespace Components
 			return header;
 		});
 	}
-
-	StringTable::~StringTable()
-	{
-		StringTable::StringTableMap.clear();
-	}
 }
diff --git a/src/Components/Modules/StringTable.hpp b/src/Components/Modules/StringTable.hpp
index 21701b24..118cd076 100644
--- a/src/Components/Modules/StringTable.hpp
+++ b/src/Components/Modules/StringTable.hpp
@@ -6,7 +6,6 @@ namespace Components
 	{
 	public:
 		StringTable();
-		~StringTable();
 
 	private:
 		static std::unordered_map<std::string, Game::StringTable*> StringTableMap;
diff --git a/src/Components/Modules/StructuredData.cpp b/src/Components/Modules/StructuredData.cpp
index 64e3b375..983ee2e7 100644
--- a/src/Components/Modules/StructuredData.cpp
+++ b/src/Components/Modules/StructuredData.cpp
@@ -311,9 +311,4 @@ namespace Components
 			}
 		});
 	}
-
-	StructuredData::~StructuredData()
-	{
-		StructuredData::MemAllocator.clear();
-	}
 }
diff --git a/src/Components/Modules/StructuredData.hpp b/src/Components/Modules/StructuredData.hpp
index 8c7a6431..3a1b42f2 100644
--- a/src/Components/Modules/StructuredData.hpp
+++ b/src/Components/Modules/StructuredData.hpp
@@ -24,7 +24,6 @@ namespace Components
 		};
 
 		StructuredData();
-		~StructuredData();
 
 	private:
 		static bool UpdateVersionOffsets(Game::StructuredDataDefSet *set, Game::StructuredDataBuffer *buffer, Game::StructuredDataDef *oldDef);
diff --git a/src/Components/Modules/Zones.cpp b/src/Components/Modules/Zones.cpp
index da24ffeb..24af1db6 100644
--- a/src/Components/Modules/Zones.cpp
+++ b/src/Components/Modules/Zones.cpp
@@ -3696,10 +3696,5 @@ namespace Components
 		Utils::Hook::Set<WORD>(0x6B9602,0xCCCC);
 #endif
 	}
-
-	Zones::~Zones()
-	{
-
-	}
 }
 #pragma optimize( "", on ) 
\ No newline at end of file
diff --git a/src/Components/Modules/Zones.hpp b/src/Components/Modules/Zones.hpp
index dd1b5df6..615bc450 100644
--- a/src/Components/Modules/Zones.hpp
+++ b/src/Components/Modules/Zones.hpp
@@ -18,7 +18,6 @@ namespace Components
 		};
 		
 		Zones();
-		~Zones();
 
 		static void SetVersion(int version);