diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index 40f3fb8e53..fc2ad63b27 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -748,7 +748,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
     if(sWorld.IsShutdowning())
         sWorld.ShutdownMsg(true,pCurrChar);
 
-    if(sWorld.getConfig(CONFIG_START_ALL_TAXI))
+    if(sWorld.getConfig(CONFIG_ALL_TAXI_PATHS))
         pCurrChar->SetTaxiCheater(true);
 
     if(pCurrChar->isGameMaster())
diff --git a/src/game/World.cpp b/src/game/World.cpp
index 4cde9683cc..4e856020f4 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -959,10 +959,8 @@ void World::LoadConfigSettings(bool reload)
     if(m_configs[CONFIG_HONOR_AFTER_DUEL] < 0)
         m_configs[CONFIG_HONOR_AFTER_DUEL]= 0;
     m_configs[CONFIG_START_ALL_EXPLORED] = sConfig.GetBoolDefault("PlayerStart.MapsExplored", false);
-    m_configs[CONFIG_DISABLE_BREATHING] = sConfig.GetBoolDefault("DisableWaterBreath", false);
     m_configs[CONFIG_START_ALL_REP] = sConfig.GetBoolDefault("PlayerStart.AllReputation", false);
     m_configs[CONFIG_ALWAYS_MAXSKILL] = sConfig.GetBoolDefault("AlwaysMaxWeaponSkill", false);
-    m_configs[CONFIG_START_ALL_TAXI] = sConfig.GetBoolDefault("PlayerStart.AllFlightPaths", false);
     m_configs[CONFIG_PVP_TOKEN_ENABLE] = sConfig.GetBoolDefault("PvPToken.Enable", false);
     m_configs[CONFIG_PVP_TOKEN_MAP_TYPE] = sConfig.GetIntDefault("PvPToken.MapAllowType", 4);
     m_configs[CONFIG_PVP_TOKEN_ID] = sConfig.GetIntDefault("PvPToken.ItemID", 29434);
diff --git a/src/game/World.h b/src/game/World.h
index 73266c1b09..fc11301f88 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -188,7 +188,6 @@ enum WorldConfigs
 
     CONFIG_START_ALL_REP,
     CONFIG_ALWAYS_MAXSKILL,
-    CONFIG_START_ALL_TAXI,
     CONFIG_PVP_TOKEN_ENABLE,
     CONFIG_PVP_TOKEN_MAP_TYPE,
     CONFIG_PVP_TOKEN_ID,