diff --git a/src/openttd.cpp b/src/openttd.cpp
index c95657d20a..829b51a4c8 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -265,17 +265,6 @@ static void ShutdownGame()
 
 	/* Uninitialize variables that are allocated dynamically */
 	GamelogReset();
-	_town_pool.CleanPool();
-	_industry_pool.CleanPool();
-	_station_pool.CleanPool();
-	_roadstop_pool.CleanPool();
-	_vehicle_pool.CleanPool();
-	_sign_pool.CleanPool();
-	_order_pool.CleanPool();
-	_group_pool.CleanPool();
-	_cargopacket_pool.CleanPool();
-	_engine_pool.CleanPool();
-	_company_pool.CleanPool();
 
 #ifdef ENABLE_NETWORK
 	free(_config_file);
@@ -283,6 +272,8 @@ static void ShutdownGame()
 
 	ResetNewGRFData();
 
+	PoolBase::CleanAll();
+
 	/* Close all and any open filehandles */
 	FioCloseAll();
 }