diff --git a/zone/corpse.cpp b/zone/corpse.cpp
index 205eddf83..4abdc72e2 100644
--- a/zone/corpse.cpp
+++ b/zone/corpse.cpp
@@ -766,8 +766,7 @@ bool Corpse::Process() {
 			Save();
 			player_corpse_depop = true;
 			database.SendCharacterCorpseToGraveyard(corpse_db_id, zone->graveyard_zoneid(),
-				(zone->GetZoneID() == zone->graveyard_zoneid()) ? zone->GetInstanceID() : 0, xyz_heading(zone->graveyard_x(),
-				zone->graveyard_y(), zone->graveyard_z(), zone->graveyard_heading()));
+				(zone->GetZoneID() == zone->graveyard_zoneid()) ? zone->GetInstanceID() : 0, zone->GetGraveyardPoint());
 			corpse_graveyard_timer.Disable();
 			ServerPacket* pack = new ServerPacket(ServerOP_SpawnPlayerCorpse, sizeof(SpawnPlayerCorpse_Struct));
 			SpawnPlayerCorpse_Struct* spc = (SpawnPlayerCorpse_Struct*)pack->pBuffer;
diff --git a/zone/zone.cpp b/zone/zone.cpp
index cc333c5fa..333d3f4da 100644
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -791,7 +791,7 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
 		LogFile->write(EQEMuLog::Debug, "Graveyard ID is %i.", graveyard_id());
 		bool GraveYardLoaded = database.GetZoneGraveyard(graveyard_id(), &pgraveyard_zoneid, &m_Graveyard.m_X, &m_Graveyard.m_Y, &m_Graveyard.m_Z, &m_Graveyard.m_Heading);
 		if(GraveYardLoaded)
-			LogFile->write(EQEMuLog::Debug, "Loaded a graveyard for zone %s: graveyard zoneid is %u x is %f y is %f z is %f heading is %f.", short_name, graveyard_zoneid(), graveyard_x(), graveyard_y(), graveyard_z(), graveyard_heading());
+			LogFile->write(EQEMuLog::Debug, "Loaded a graveyard for zone %s: graveyard zoneid is %u at %s.", short_name, graveyard_zoneid(), to_string(m_Graveyard).c_str());
 		else
 			LogFile->write(EQEMuLog::Error, "Unable to load the graveyard id %i for zone %s.", graveyard_id(), short_name);
 	}
diff --git a/zone/zone.h b/zone/zone.h
index 1cc387f18..6c2581d38 100644
--- a/zone/zone.h
+++ b/zone/zone.h
@@ -112,10 +112,6 @@ public:
     inline xyz_location GetSafePoint() { return m_SafePoint; }
 	inline const uint32& graveyard_zoneid()	{ return pgraveyard_zoneid; }
 	inline xyz_heading GetGraveyardPoint() { return m_Graveyard; }
-	inline const float& graveyard_x()	{ return m_Graveyard.m_X; }
-	inline const float& graveyard_y()	{ return m_Graveyard.m_Y; }
-	inline const float& graveyard_z()	{ return m_Graveyard.m_Z; }
-	inline const float& graveyard_heading() { return m_Graveyard.m_Heading; }
 	inline const uint32& graveyard_id()	{ return pgraveyard_id; }
 
 	inline const uint32& GetMaxClients() { return pMaxClients; }