Merge remote-tracking branch 'upstream/master'

src/misc.cpp

@@ -54,7 +54,6 @@ void InitializeObjects();
 void InitializeTrees();
 void InitializeCompanies();
 void InitializeCheats();
-void InitializeNPF();
 void InitializeOldNames();
 
 /**
@@ -149,9 +148,6 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 	InitializeTrees();
 	InitializeIndustries();
 	InitializeObjects();
-	InitializeBuildingCounts();
-
-	InitializeNPF();
 
 	InitializeCompanies();
 	AI::Initialize();