diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp
index 4cd030410..76cf961e8 100644
--- a/zone/waypoints.cpp
+++ b/zone/waypoints.cpp
@@ -1067,77 +1067,6 @@ int	ZoneDatabase::GetHighestGrid(uint32 zoneid) {
 	return Strings::ToInt(row[0]);
 }
 
-uint8 ZoneDatabase::GetGridType2(uint32 grid, uint16 zoneid) {
-
-	int type2 = 0;
-	std::string query = StringFormat("SELECT type2 FROM grid WHERE id = %i AND zoneid = %i", grid, zoneid);
-	auto results = QueryDatabase(query);
-	if (!results.Success()) {
-		return 0;
-	}
-
-	if (results.RowCount() != 1)
-		return 0;
-
-	auto row = results.begin();
-
-	return Strings::ToInt(row[0]);
-}
-
-bool ZoneDatabase::GetWaypoints(uint32 grid, uint16 zoneid, uint32 num, wplist* wp) {
-
-	if (wp == nullptr)
-		return false;
-
-	std::string query = StringFormat("SELECT x, y, z, pause, heading FROM grid_entries "
-		"WHERE gridid = %i AND number = %i AND zoneid = %i", grid, num, zoneid);
-	auto results = QueryDatabase(query);
-	if (!results.Success()) {
-		return false;
-	}
-
-	if (results.RowCount() != 1)
-		return false;
-
-	auto row = results.begin();
-
-	wp->x = Strings::ToFloat(row[0]);
-	wp->y = Strings::ToFloat(row[1]);
-	wp->z = Strings::ToFloat(row[2]);
-	wp->pause = Strings::ToInt(row[3]);
-	wp->heading = Strings::ToFloat(row[4]);
-
-	return true;
-}
-
-void ZoneDatabase::AssignGrid(Client *client, uint32 grid_id, uint32 entity_id) {
-	auto target_npc = entity_list.GetNPCByID(entity_id);
-	auto spawn2_id = target_npc ? target_npc->GetSpawnPointID() : 0;
-	if (spawn2_id) {
-		std::string query = fmt::format(
-			"UPDATE spawn2 SET pathgrid = {} WHERE id = {}",
-			grid_id,
-			spawn2_id
-		);
-		auto results = QueryDatabase(query);
-
-		if (!results.Success() || results.RowsAffected() != 1) {
-			return;
-		}
-
-		client->Message(
-			Chat::White,
-			fmt::format(
-				"{} (Spawn2 ID {}) will now use Grid ID {}.",
-				target_npc->GetCleanName(),
-				spawn2_id,
-				grid_id
-			).c_str()
-		);
-	}
-}
-
-
 /******************
 * ModifyGrid - Either adds an empty grid, or removes a grid and all its waypoints, for a particular zone.
 *	remove:		TRUE if we are deleting the specified grid, FALSE if we are adding it
diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index ecd9d7580..e6dbcab44 100755
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -2534,22 +2534,6 @@ void ZoneDatabase::LoadMercenaryEquipment(Merc* m)
 	}
 }
 
-uint8 ZoneDatabase::GetGridType(uint32 grid, uint32 zoneid ) {
-
-	std::string query = StringFormat("SELECT type FROM grid WHERE id = %i AND zoneid = %i", grid, zoneid);
-	auto results = QueryDatabase(query);
-	if (!results.Success()) {
-        return 0;
-	}
-
-    if (results.RowCount() != 1)
-        return 0;
-
-    auto& row = results.begin();
-
-	return Strings::ToInt(row[0]);
-}
-
 void ZoneDatabase::SaveMerchantTemp(uint32 npcid, uint32 slot, uint32 zone_id, uint32 instance_id, uint32 item, uint32 charges){
 
 	std::string query = StringFormat("REPLACE INTO merchantlist_temp (npcid, slot, zone_id, instance_id, itemid, charges) "
diff --git a/zone/zonedb.h b/zone/zonedb.h
index 38e0df95a..f0f990696 100644
--- a/zone/zonedb.h
+++ b/zone/zonedb.h
@@ -541,10 +541,6 @@ public:
 	void		ModifyGrid(Client *c, bool remove, uint32 id, uint8 type = 0, uint8 type2 = 0, uint16 zoneid = 0);
 	bool		GridExistsInZone(uint32 zone_id, uint32 grid_id);
 	void		ModifyWP(Client *c, uint32 grid_id, uint32 wp_num, const glm::vec3& location, uint32 script = 0, uint16 zoneid = 0);
-	uint8		GetGridType(uint32 grid, uint32 zoneid);
-	uint8		GetGridType2(uint32 grid, uint16 zoneid);
-	bool		GetWaypoints(uint32 grid, uint16 zoneid, uint32 num, wplist* wp);
-	void        AssignGrid(Client *client, uint32 grid_id, uint32 entity_id);
 	int			GetHighestGrid(uint32 zoneid);
 	int			GetHighestWaypoint(uint32 zoneid, uint32 gridid);
 	int			GetRandomWaypointLocFromGrid(glm::vec4 &loc, uint16 zoneid, int grid);