Some updates for 6.0.2

diff --git a/TomTom.lua b/TomTom.lua
index c3ef0dc..5892893 100755
--- a/TomTom.lua
+++ b/TomTom.lua
@@ -333,11 +333,11 @@ function TomTom:ShowHideWorldCoords()
         TomTomWorldFrame.Cursor:ClearAllPoints()

         if mapSizedUp then
-            TomTomWorldFrame.Player:SetPoint("RIGHT", WorldMapPositioningGuide, "BOTTOM", -15, 15)
-            TomTomWorldFrame.Cursor:SetPoint("LEFT", WorldMapPositioningGuide, "BOTTOM", 15, 15)
+            TomTomWorldFrame.Player:SetPoint("TOPRIGHT", WorldMapTitleButton, "TOPRIGHT",  -64, -8)
+            TomTomWorldFrame.Cursor:SetPoint("TOPLEFT",  WorldMapTitleButton, "TOPRIGHT",  352, -8)
         else
-            TomTomWorldFrame.Player:SetPoint("LEFT", WorldMapPositioningGuide, "BOTTOMLEFT", 25, 16)
-            TomTomWorldFrame.Cursor:SetPoint("LEFT", WorldMapPositioningGuide, "BOTTOMLEFT", 140, 16)
+            TomTomWorldFrame.Player:SetPoint("TOPRIGHT", WorldMapTitleButton, "TOPRIGHT", -256, -8)
+            TomTomWorldFrame.Cursor:SetPoint("TOPLEFT",  WorldMapTitleButton, "TOPRIGHT",  128, -8)
         end

         TomTomWorldFrame.Player:Hide()
diff --git a/TomTom.toc b/TomTom.toc
index c3c99b8..b0007f8 100755
--- a/TomTom.toc
+++ b/TomTom.toc
@@ -1,4 +1,4 @@
-## Interface: 50400
+## Interface: 60000
 ## Title: TomTom
 ## Author: jnwhiteh
 ## Version: @project-version@
diff --git a/TomTom_POIIntegration.lua b/TomTom_POIIntegration.lua
index 0453fe0..3d3b92b 100755
--- a/TomTom_POIIntegration.lua
+++ b/TomTom_POIIntegration.lua
@@ -127,9 +127,6 @@ end
 local eventFrame = CreateFrame("Frame")
 eventFrame:RegisterEvent("QUEST_POI_UPDATE")
 eventFrame:RegisterEvent("QUEST_LOG_UPDATE")
-hooksecurefunc("WatchFrame_Update", function(self)
-    ObjectivesChanged()
-end)

 eventFrame:SetScript("OnEvent", function(self, event, ...)
     if event == "QUEST_POI_UPDATE" then
@@ -209,28 +206,6 @@ local function poi_OnClick(self, button)
     end
 end

-local hooked = {}
-hooksecurefunc("QuestPOI_DisplayButton", function(parentName, buttonType, buttonIndex, questId)
-    local buttonName = "poi"..tostring(parentName)..tostring(buttonType).."_"..tostring(buttonIndex);
-    local poiButton = _G[buttonName];
-
-    if not hooked[buttonName] then
-        poiButton:HookScript("OnClick", poi_OnClick)
-        poiButton:RegisterForClicks("AnyUp")
-        hooked[buttonName] = true
-    end
-
-    -- Check to see if there is a swap button
-    local swapName = "poi" .. parentName .. "_Swap"
-    local swapButton = _G[swapName]
-
-    if not hooked[swapName] and swapButton then
-        swapButton:HookScript("OnClick", poi_OnClick)
-        swapButton:RegisterForClicks("AnyUp")
-        hooked[swapName] = true
-    end
-end)
-
 function TomTom:EnableDisablePOIIntegration()
     enableClicks= TomTom.profile.poi.enable
     modifier = TomTom.profile.poi.modifier