diff --git a/common/database.cpp b/common/database.cpp
index 5c087615b..35c850277 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -1988,19 +1988,18 @@ bool Database::CharacterInInstanceGroup(uint16 instance_id, uint32 char_id)
 
 void Database::DeleteInstance(uint16 instance_id)
 {
-	char *query = nullptr;
 
-	QueryDatabase(query, MakeAnyLenString(&query, "DELETE FROM instance_list WHERE id=%u", instance_id));
-	safe_delete_array(query);
+	std::string query = StringFormat("DELETE FROM instance_list WHERE id=%u", instance_id);
+	QueryDatabase(query);
 
-	QueryDatabase(query, MakeAnyLenString(&query, "DELETE FROM instance_list_player WHERE id=%u", instance_id));
-	safe_delete_array(query);
+	query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id);
+	QueryDatabase(query);
 
-	QueryDatabase(query, MakeAnyLenString(&query, "DELETE FROM respawn_times WHERE instance_id=%u", instance_id));
-	safe_delete_array(query);
+	query = StringFormat("DELETE FROM respawn_times WHERE instance_id=%u", instance_id);
+	QueryDatabase(query);
 
-	QueryDatabase(query, MakeAnyLenString(&query, "DELETE FROM spawn_condition_values WHERE instance_id=%u", instance_id));
-	safe_delete_array(query);
+	query = StringFormat("DELETE FROM spawn_condition_values WHERE instance_id=%u", instance_id);
+	QueryDatabase(query);
 
 	BuryCorpsesInInstance(instance_id);
 }