diff --git a/src/libs/raceengine/racemain.cpp b/src/libs/raceengine/racemain.cpp
index 1e517cdd..8d96299c 100644
--- a/src/libs/raceengine/racemain.cpp
+++ b/src/libs/raceengine/racemain.cpp
@@ -395,7 +395,7 @@ ReRaceRealStart(void)
 	// Initalize cars graphics.
 	if (ReInfo->_displayMode == RM_DISP_MODE_NORMAL) {
 		RaceEngine::self().userInterface().addLoadingMessage("Loading cars ...");
-		RaceEngine::self().userInterface().loadCarsGraphics(ReInfo->s);
+		ReInitCarGraphics();
 	}
 
 	if (GetNetwork())
diff --git a/src/libs/raceengine/racetrack.cpp b/src/libs/raceengine/racetrack.cpp
index 4487f03e..1a019469 100644
--- a/src/libs/raceengine/racetrack.cpp
+++ b/src/libs/raceengine/racetrack.cpp
@@ -81,11 +81,6 @@ ReTrackInit(void)
 
 	reTrackDump(ReInfo->track, 0);
 
-	// TODO: Remove (old graphics setup, and anyway : not needed ?)
-	// Make the graphics engine aware of the possibly changed track.
-	// if (ReInfo->_reGraphicItf.inittrack)
-	// 	ReInfo->_reGraphicItf.inittrack(ReInfo->track);
-
 	return 0;
 }//ReTrackInit
 
@@ -418,9 +413,6 @@ reTrackUpdatePhysics(void)
 int
 ReTrackShutdown(void)
 {
-	// TODO: Remove (old graphics setup)
-	// if (ReInfo->_reGraphicItf.shutdowntrack)
-	// 	ReInfo->_reGraphicItf.shutdowntrack();
 	RaceEngine::self().userInterface().unloadTrackGraphics();
 
 	return 0;
diff --git a/src/libs/raceengine/raceupdate.cpp b/src/libs/raceengine/raceupdate.cpp
index 8f42c770..be81eb0f 100644
--- a/src/libs/raceengine/raceupdate.cpp
+++ b/src/libs/raceengine/raceupdate.cpp
@@ -612,6 +612,9 @@ public:
 	//! Constructor.
 	reMainUpdater(reSituationUpdater* pSituUpdater);
 
+	//! Initialize the graphics engine about cars.
+	void initCarGraphics(void);
+
 	//! Return from pit menu
 	void onBackFromPitMenu(tCarElt *car);
 
@@ -668,6 +671,18 @@ reMainUpdater::reMainUpdater(reSituationUpdater* pSituUpdater)
 #endif
 }
 
+void reMainUpdater::initCarGraphics(void)
+{
+	RaceEngine::self().userInterface().loadCarsGraphics(_pReInfo->s);
+}
+
+void reMainUpdater::onBackFromPitMenu(tCarElt *car)
+{
+	_pSituationUpdater->updateCarPitCmd(car->index, &car->pitcmd);
+
+	RaceEngine::self().userInterface().activateGameScreen();
+}
+
 void reMainUpdater::captureScreen(void)
 {
 	char filename[256];
@@ -679,14 +694,6 @@ void reMainUpdater::captureScreen(void)
     RaceEngine::self().userInterface().captureRaceScreen(filename);
 }
 
-
-void reMainUpdater::onBackFromPitMenu(tCarElt *car)
-{
-	_pSituationUpdater->updateCarPitCmd(car->index, &car->pitcmd);
-
-	RaceEngine::self().userInterface().activateGameScreen();
-}
-
 int reMainUpdater::operator()(void)
 {
 	// Note: In reMainUpdater, we should not read/write ReInfo (only _pReInfo).
@@ -827,6 +834,11 @@ void ReInitUpdaters()
 	GfSchedConfigureEventLog("raceupdate", "physics",  10000, 0.0);
 }
 
+void ReInitCarGraphics(void)
+{
+	mainUpdater->initCarGraphics();
+}
+
 void ReAccelerateTime(double fMultFactor)
 {
 	ReInfo->_reTimeMult *= fMultFactor;
diff --git a/src/libs/raceengine/raceupdate.h b/src/libs/raceengine/raceupdate.h
index 4cc775c3..297a8adb 100644
--- a/src/libs/raceengine/raceupdate.h
+++ b/src/libs/raceengine/raceupdate.h
@@ -27,8 +27,7 @@
 #define _RACEUPDATE_H_
 
 extern void ReInitUpdaters();
-// TODO: Remove (old graphics setup): code moved into ReRaceRealStart
-//extern void ReInitCarGraphics();
+extern void ReInitCarGraphics();
 extern void ReShutdownUpdaters();
 
 extern void ReAccelerateTime(double fMultFactor);