diff -r 82ecd3063a53 src/server/game/Globals/ObjectMgr.cpp
--- a/src/server/game/Globals/ObjectMgr.cpp    Fri Aug 24 10:18:55 2012 +0300
+++ b/src/server/game/Globals/ObjectMgr.cpp    Sat Aug 25 01:51:36 2012 +0300
@@ -5767,21 +5767,6 @@
      sLog->outString();
  }
   
-WorldSafeLocsEntry const* ObjectMgr::GetDefaultGraveYard(uint32 team)
-{
-    enum DefaultGraveyard
-    {
-        HORDE_GRAVEYARD = 10, // Crossroads
-        ALLIANCE_GRAVEYARD = 4, // Westfall
-    };
-
-    if (team == HORDE)
-        return sWorldSafeLocsStore.LookupEntry(HORDE_GRAVEYARD);
-    else if (team == ALLIANCE)
-        return sWorldSafeLocsStore.LookupEntry(ALLIANCE_GRAVEYARD);
-    else return NULL;
-}
-
  WorldSafeLocsEntry const* ObjectMgr::GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team)
  {
      // search for zone associated closest graveyard
@@ -5790,10 +5775,8 @@
      if (!zoneId)
      {
          if (z > -500)
-        {
              sLog->outError("ZoneId not found for map %u coords (%f, %f, %f)", MapId, x, y, z);
-            return GetDefaultGraveYard(team);
-        }
+        return NULL;
      }
   
      // Simulate std. algorithm:
@@ -5811,7 +5794,7 @@
      if (graveLow == graveUp && !map->IsBattleArena())
      {
          sLog->outErrorDb("Table `game_graveyard_zone` incomplete: Zone %u Team %u does not have a linked graveyard.", zoneId, team);
-        return GetDefaultGraveYard(team);
+        return NULL;
      }
   
      // at corpse map
diff -r 82ecd3063a53 src/server/game/Globals/ObjectMgr.h
--- a/src/server/game/Globals/ObjectMgr.h    Fri Aug 24 10:18:55 2012 +0300
+++ b/src/server/game/Globals/ObjectMgr.h    Sat Aug 25 01:51:36 2012 +0300
@@ -711,7 +711,6 @@
   
          GossipText const* GetGossipText(uint32 Text_ID) const;
   
-        WorldSafeLocsEntry const* GetDefaultGraveYard(uint32 team);
          WorldSafeLocsEntry const* GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team);
          bool AddGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool persist = true);
          void RemoveGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool persist = false);