diff --git a/src/game_manager.cpp b/src/game_manager.cpp
index 998b2d6a7..925dc9375 100644
--- a/src/game_manager.cpp
+++ b/src/game_manager.cpp
@@ -64,13 +64,10 @@ void GameManager::run()
         material_manager->getMaterial("st_title_screen.rgb")->getIndex();
     while(!m_abort)
     {
-        // Run input processing.
-        // FIXME: rename this to sdl_input or something.
-        drv_loop();
+        sdl_input();
 
         // Now the screen may have changed and
         // needs to be updated.
-
         if(m_started) m_prev_time = m_curr_time;
         else
         {
diff --git a/src/sdldrv.cpp b/src/sdldrv.cpp
index 4a67b987b..75bbebc83 100755
--- a/src/sdldrv.cpp
+++ b/src/sdldrv.cpp
@@ -248,7 +248,7 @@ void input(InputType type, int id0, int id1, int id2, int value)
   * flexibility (= treat 4 directions as four buttons).
   *
   */
-void drv_loop()
+void sdl_input()
 {
     SDL_Event ev;
 
diff --git a/src/sdldrv.hpp b/src/sdldrv.hpp
index 3bdf81d9c..6b56189b0 100755
--- a/src/sdldrv.hpp
+++ b/src/sdldrv.hpp
@@ -50,7 +50,7 @@ void drv_deinit();
 void drv_toggleFullscreen(bool resetTextures=1);
 void setVideoMode(bool resetTextures=1);
 
-void drv_loop();
+void sdl_input();
 
 void drv_setMode(InputDriverMode);
 bool drv_isInMode(InputDriverMode);
diff --git a/src/world.cpp b/src/world.cpp
index 09fef3abd..9f36a8c24 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -261,11 +261,6 @@ void World::resetAllKarts()
 #endif
 }   // resetAllKarts
 
-//-----------------------------------------------------------------------------
-void World::draw()
-{
-}
-
 //-----------------------------------------------------------------------------
 void World::update(float dt)
 {
@@ -273,7 +268,7 @@ void World::update(float dt)
 
     checkRaceStatus();
     // this line was before checkRaceStatus. but m_clock is set to 0.0 in
-    // checkRaceStatus on start, so m_clock would not be synchron and the
+    // checkRaceStatus on start, so m_clock would not be synchronized and the
     // first delta would not be added .. that would cause a gap in 
     // replay-recording
     m_clock += dt;
diff --git a/src/world.hpp b/src/world.hpp
index d91af9bdf..b686a0a64 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -75,7 +75,6 @@ public:
           {return m_track->GetHOT(start, end, leaf, nrm);}
     int   Collision(sgSphere* s, AllHits *a) const {return m_track->Collision(s,a); }
 #endif
-    void draw();
     void update(float delta);
     void restartRace();
     void disableRace(); // Put race into limbo phase