diff --git a/src/drivers/simplix/src/unitdriver.cpp b/src/drivers/simplix/src/unitdriver.cpp
index 47a444fa7..1dc664fea 100644
--- a/src/drivers/simplix/src/unitdriver.cpp
+++ b/src/drivers/simplix/src/unitdriver.cpp
@@ -930,9 +930,6 @@ void TDriver::NewRace(PtCarElt Car, PSituation Situation)
 //--------------------------------------------------------------------------*
 void TDriver::Drive()
 {
-#ifdef TORCS_NG
-  RtTeamManagerStart();
-#endif
 /*
   if (CarLaps == 1 + oIndex)
     oTestPitStop = 1;
diff --git a/src/drivers/usr_GP3601/driver.cpp b/src/drivers/usr_GP3601/driver.cpp
index 4281f1518..39f344319 100644
--- a/src/drivers/usr_GP3601/driver.cpp
+++ b/src/drivers/usr_GP3601/driver.cpp
@@ -428,10 +428,7 @@ void Driver::newRace(tCarElt* car, tSituation *s)
  		}
  	}
 #ifdef TORCS_NG
-    RtTeamManagerShowInfo();
 	teamIndex = RtTeamManagerIndex(car,track,s);
-    RtTeamManagerDump();
-
 	strategy->setTeamIndex(teamIndex);
 #endif
 }
@@ -602,10 +599,6 @@ void Driver::drive(tSituation *s)
 	laststeer = car->_steerCmd;
 	memset(&car->ctrl, 0, sizeof(tCarCtrl));
 
-#ifdef TORCS_NG
-    RtTeamManagerStart(); // Start team manager in case not all robots are using it
-#endif
-
 	update(s);
 
 	//pit->setPitstop(true);
@@ -701,7 +694,6 @@ void Driver::endRace(tSituation *s)
 void Driver::shutdown()
 {
 #ifdef TORCS_NG
-	RtTeamManagerDump();
 	RtTeamManagerRelease();
 #endif
 	// Nothing for now.
diff --git a/src/libs/raceengineclient/raceinit.cpp b/src/libs/raceengineclient/raceinit.cpp
index 8d273a54d..ee6be48fa 100644
--- a/src/libs/raceengineclient/raceinit.cpp
+++ b/src/libs/raceengineclient/raceinit.cpp
@@ -44,6 +44,8 @@
 #include "racegl.h"
 #include "raceresults.h"
 
+#include "teammanager.h"
+
 #include "raceinit.h"
 
 static const char *level_str[] = { ROB_VAL_ROOKIE, ROB_VAL_AMATEUR, ROB_VAL_SEMI_PRO, ROB_VAL_PRO };
@@ -786,6 +788,7 @@ ReRaceCleanDrivers(void)
 		GfParmReleaseHandle(ReInfo->s->cars[i]->_paramsHandle);
 		free(robot);
 	}
+	RtTeamManagerRelease();
 
 	FREEZ(ReInfo->s->cars);
 	ReInfo->s->cars = 0;
diff --git a/src/libs/raceengineclient/racemain.cpp b/src/libs/raceengineclient/racemain.cpp
index 4543383c6..d3c393d44 100644
--- a/src/libs/raceengineclient/racemain.cpp
+++ b/src/libs/raceengineclient/racemain.cpp
@@ -38,6 +38,8 @@
 #include "racestate.h"
 #include "racemanmenu.h"
 
+#include "teammanager.h"
+
 #include "racemain.h"
 
 static char buf[1024];
@@ -220,6 +222,7 @@ reRaceRealStart(void)
 		robot->rbNewRace(robot->index, s->cars[i], s);
 	}
 	carInfo = ReInfo->_reCarInfo;
+	RtTeamManagerStart();
 
 	ReInfo->_reSimItf.update(s, RCM_MAX_DT_SIMU, -1);
 	for (i = 0; i < s->_ncars; i++) {
diff --git a/src/libs/robottools/rtteammanager.cpp b/src/libs/robottools/rtteammanager.cpp
index 099a5429e..e7a1b86a7 100644
--- a/src/libs/robottools/rtteammanager.cpp
+++ b/src/libs/robottools/rtteammanager.cpp
@@ -486,15 +486,7 @@ int RtTeamManagerIndex(CarElt* const Car, tTrack* const Track, tSituation* Situa
 	tTeamPit* TeamPit = NULL;
 	tTeam* Team = RtTeamManagerAdd(Car,Teammate,&TeamPit);
 
-	int TeamIndex = RtTeamDriverAdd(Team, Teammate, TeamPit);
-
-	tTeamDriver* TeamDriver = RtTM->TeamDrivers;
-	if (TeamDriver->Count < RtTM->Count)
-		return TeamIndex;
-
-	RtTeamManagerSetup();
-
-	return TeamIndex;
+	return RtTeamDriverAdd(Team, Teammate, TeamPit);
 }
 
 //