--- a/Main.lua	Tue May 01 19:27:15 2018 -0400
+++ b/Main.lua	Tue May 01 20:08:59 2018 -0400
@@ -112,7 +112,6 @@
     COMBAT_LOG_EVENT_UNFILTERED = true,
     COMBAT_TEXT_UPDATE = true,
     CURSOR_UPDATE = true,
-    FORGE_MASTER_OPENED = true,
     GARRISON_MISSION_NPC_CLOSED = "ResumeChatLootRecording",
     GARRISON_MISSION_NPC_OPENED = "StopChatLootRecording",
     GARRISON_SHIPYARD_NPC_CLOSED = "ResumeChatLootRecording",
@@ -1043,6 +1042,9 @@
 function WDP:ProcessWorldQuests()
     -- Ignore if player is low level (there are some world quests before max level now, but we can collect enough data from 110s alone still)
     if _G.UnitLevel("player") ~= 110 then return end
+    
+    -- Ignore if BFA for now; Map API's lack of completion causes issues here
+    if IS_BFA then return end
 
     -- Get current continent and zones in current continent
     local continentIndex, continentID = GetCurrentMapContinent()
@@ -3048,11 +3050,6 @@
     end
 
 
-    function WDP:FORGE_MASTER_OPENED(event_name)
-        SetUnitField("arcane_reforger", private.UNIT_TYPES.NPC)
-    end
-
-
     local GOSSIP_SHOW_FUNCS = {
         [private.UNIT_TYPES.NPC] = function(unit_idnum)
             local gossip_options = { _G.GetGossipOptions() }