diff --git a/QuestHelper/arrow.lua b/QuestHelper/arrow.lua
index 2876c29..c49649c 100644
--- a/QuestHelper/arrow.lua
+++ b/QuestHelper/arrow.lua
@@ -1,3 +1,5 @@
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["arrow.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["arrow.lua"] = GetTime()
 
diff --git a/QuestHelper/bst_astrolabe.lua b/QuestHelper/bst_astrolabe.lua
deleted file mode 100644
index c4606b1..0000000
--- a/QuestHelper/bst_astrolabe.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-QuestHelper_File["bst_astrolabe.lua"] = "4.0.1.$svnversion$"
-QuestHelper_Loadtime["bst_astrolabe.lua"] = GetTime()
diff --git a/QuestHelper/bst_ctl.lua b/QuestHelper/bst_ctl.lua
deleted file mode 100644
index 3362360..0000000
--- a/QuestHelper/bst_ctl.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-QuestHelper_File["bst_ctl.lua"] = "4.0.1.$svnversion$"
-QuestHelper_Loadtime["bst_ctl.lua"] = GetTime()
diff --git a/QuestHelper/bst_libaboutpanel.lua b/QuestHelper/bst_libaboutpanel.lua
deleted file mode 100644
index 5a4ec35..0000000
--- a/QuestHelper/bst_libaboutpanel.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-QuestHelper_File["bst_libaboutpanel.lua"] = "4.0.1.$svnversion$"
-QuestHelper_Loadtime["bst_libaboutpanel.lua"] = GetTime()
diff --git a/QuestHelper/bst_post.lua b/QuestHelper/bst_post.lua
deleted file mode 100644
index 0f3add8..0000000
--- a/QuestHelper/bst_post.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-QuestHelper_File["bst_post.lua"] = "4.0.1.$svnversion$"
-QuestHelper_Loadtime["bst_post.lua"] = GetTime()
diff --git a/QuestHelper/bst_range.lua b/QuestHelper/bst_range.lua
deleted file mode 100644
index 1a9d67c..0000000
--- a/QuestHelper/bst_range.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-QuestHelper_File["bst_range.lua"] = "4.0.1.$svnversion$"
-QuestHelper_Loadtime["bst_range.lua"] = GetTime()
diff --git a/QuestHelper/cartographer.lua b/QuestHelper/cartographer.lua
deleted file mode 100644
index d83f026..0000000
--- a/QuestHelper/cartographer.lua
+++ /dev/null
@@ -1,71 +0,0 @@
-QuestHelper_File["cartographer.lua"] = "4.0.1.$svnversion$"
-QuestHelper_Loadtime["cartographer.lua"] = GetTime()
-
-local cartographer_cb
-local cartographer_wp
-
-local QuestHelperPoint
-
-local function cartographer_wp_update(c, z, x, y, desc)
-  if cartographer_wp then
-    cartographer_wp:Cancel()
-  end
-  
-  if not QuestHelper_Pref.hide and c and c >= 0 then
-    cartographer_wp = QuestHelperPoint:new(c, z, x, y, desc)
-    Cartographer_Waypoints:AddWaypoint(cartographer_wp)
-  end
-end
-
-function QuestHelper:EnableCartographer()
-  if Cartographer_Waypoints and Waypoint and not Waypoint.prototype then
-    if not QuestHelperPoint then
-      QuestHelperPoint = Waypoint:new()
-      QuestHelperPoint.ShowOnMap = false
-      
-      function QuestHelperPoint:init(c, z, x, y, desc)
-        self.x, self.y, self.task = x, y, desc
-        
-        local zone = QuestHelper.Astrolabe:GetMapVirtualZones(c)[z] -- wellllp
-        
-        if Rock then
-          local LibBabble = Rock("LibBabble-Zone-3.0", false, true)
-          if LibBabble then
-            zone = LibBabble:GetReverseLookupTable()[zone]
-          end
-        end
-        
-        self.Zone = zone
-      end
-
-      function QuestHelperPoint:Cancel()
-        self.task = nil
-        
-        if cartographer_wp == self then
-          cartographer_wp = nil
-        end
-        
-        Waypoint.Cancel(self)
-      end
-
-      function QuestHelperPoint:ToString()
-        return self.task or "Waypoint"
-      end
-    end
-    
-    if not cartographer_cb then
-      cartographer_cb = QuestHelper:AddWaypointCallback(cartographer_wp_update)
-    end
-  end
-end
-
-function QuestHelper:DisableCartographer()
-  if cartographer_cb then
-    if cartographer_wp then
-      cartographer_wp:Cancel()
-    end
-    
-    QuestHelper:RemoveWaypointCallback(cartographer_cb)
-    cartographer_cb = nil
-  end
-end
diff --git a/QuestHelper/cartographer_is_terrible.lua b/QuestHelper/cartographer_is_terrible.lua
deleted file mode 100644
index 20f69ed..0000000
--- a/QuestHelper/cartographer_is_terrible.lua
+++ /dev/null
@@ -1,31 +0,0 @@
--- QuestHelper_File["cartographer_is_terrible.lua"] = "4.0.1.$svnversion$"
--- QuestHelper_Loadtime["cartographer_is_terrible.lua"] = GetTime()
-
--- http://gunnerkrigg.wikia.com/wiki/Category:Terrible
-
--- if Cartographer and Cartographer.SetCurrentInstance and Cartographer_InstanceMaps and Cartographer_InstanceMaps.OnEnable then
---  local nop = function () end
-  
---  function hookitsbrainsout(name)
---    local oldfunc = _G[name]
---    _G[name] = function(...)
---      local temp = WorldMapLevelDropDown_Update
---      WorldMapLevelDropDown_Update = nop  -- YOINK
---      oldfunc(...)
---      WorldMapLevelDropDown_Update = temp -- KNIOY
---    end
---  end
-  
---  local oldenable = Cartographer_InstanceMaps.OnEnable
---  function Cartographer_InstanceMaps:OnEnable(...)
---    oldenable(self, ...)
-    
---    hookitsbrainsout("SetMapZoom")
---    hookitsbrainsout("SetMapToCurrentZone")
---  end
-  
--- end
-
--- There's a bug in Cartographer where SetMapZoom() or SetMapToCurrentZone(), called in an instance, causes any open menus to instantly close. Questhelper (and in general, anything that uses Astrolabe, and other UI mods as well) call those function every frame if the map is closed. This isn't a performance problem or anything, but it happens to trigger the Cartographer bug.
--- The top two bugs on the Cartographer tracker are both this one, as well as a third bug listed later down. I've talked to both of the possibly-main Cartographer maintainers about fixing it, neither are interested. It's pretty clearly not going to be fixed.
--- So here's a hack. The problem is the WorldMapLevelDropDown_Update call which, after a few nested calls, is eventually called. Why's it there? I dunno. What will removing it break? Not a clue. This cute little hook automatically disables it during the call of the important functions. Will this be a problem for Cartographer? Damned if I know. Will it be *my* problem? No! No it will not.
\ No newline at end of file
diff --git a/QuestHelper/collect.lua b/QuestHelper/collect.lua
index 3623a5d..fc313e0 100644
--- a/QuestHelper/collect.lua
+++ b/QuestHelper/collect.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_achievement.lua b/QuestHelper/collect_achievement.lua
index d086a95..3b290ba 100644
--- a/QuestHelper/collect_achievement.lua
+++ b/QuestHelper/collect_achievement.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_achievement.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_achievement.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_bitstream.lua b/QuestHelper/collect_bitstream.lua
index 9f43168..288c8b4 100644
--- a/QuestHelper/collect_bitstream.lua
+++ b/QuestHelper/collect_bitstream.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_bitstream.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_bitstream.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_equip.lua b/QuestHelper/collect_equip.lua
index 88809ce..d94b246 100644
--- a/QuestHelper/collect_equip.lua
+++ b/QuestHelper/collect_equip.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_equip.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_equip.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_flight.lua b/QuestHelper/collect_flight.lua
index a5b481b..646a722 100644
--- a/QuestHelper/collect_flight.lua
+++ b/QuestHelper/collect_flight.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_flight.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_flight.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_hearth.lua b/QuestHelper/collect_hearth.lua
index 248fbb7..4fa775c 100644
--- a/QuestHelper/collect_hearth.lua
+++ b/QuestHelper/collect_hearth.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_hearth.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_hearth.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_item.lua b/QuestHelper/collect_item.lua
index f880db1..b4f8eed 100644
--- a/QuestHelper/collect_item.lua
+++ b/QuestHelper/collect_item.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_item.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_item.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_location.lua b/QuestHelper/collect_location.lua
index 530e09c..bc966b4 100644
--- a/QuestHelper/collect_location.lua
+++ b/QuestHelper/collect_location.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_location.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_location.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_loot.lua b/QuestHelper/collect_loot.lua
index 5d4a518..d78844a 100644
--- a/QuestHelper/collect_loot.lua
+++ b/QuestHelper/collect_loot.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_loot.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_loot.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_lzw.lua b/QuestHelper/collect_lzw.lua
index eb54958..941693d 100644
--- a/QuestHelper/collect_lzw.lua
+++ b/QuestHelper/collect_lzw.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_lzw.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_lzw.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_merchant.lua b/QuestHelper/collect_merchant.lua
index 6d7b5b5..1448296 100644
--- a/QuestHelper/collect_merchant.lua
+++ b/QuestHelper/collect_merchant.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_merchant.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_merchant.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_merger.lua b/QuestHelper/collect_merger.lua
index b22d261..8f2c191 100644
--- a/QuestHelper/collect_merger.lua
+++ b/QuestHelper/collect_merger.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_merger.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_merger.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_monster.lua b/QuestHelper/collect_monster.lua
index 179393f..f2ea02f 100644
--- a/QuestHelper/collect_monster.lua
+++ b/QuestHelper/collect_monster.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_monster.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_monster.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_notifier.lua b/QuestHelper/collect_notifier.lua
index 11a671f..9e135e5 100644
--- a/QuestHelper/collect_notifier.lua
+++ b/QuestHelper/collect_notifier.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_notifier.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_notifier.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_object.lua b/QuestHelper/collect_object.lua
index 1b7a37b..b3a456f 100644
--- a/QuestHelper/collect_object.lua
+++ b/QuestHelper/collect_object.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_object.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_object.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_patterns.lua b/QuestHelper/collect_patterns.lua
index 122463c..5f4719d 100644
--- a/QuestHelper/collect_patterns.lua
+++ b/QuestHelper/collect_patterns.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_patterns.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_patterns.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_quest.lua b/QuestHelper/collect_quest.lua
index 777ac93..69e0c33 100644
--- a/QuestHelper/collect_quest.lua
+++ b/QuestHelper/collect_quest.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_quest.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_quest.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_spec.lua b/QuestHelper/collect_spec.lua
index a080206..625d4f4 100644
--- a/QuestHelper/collect_spec.lua
+++ b/QuestHelper/collect_spec.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_spec.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_spec.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_traveled.lua b/QuestHelper/collect_traveled.lua
index d738dae..0fcce52 100644
--- a/QuestHelper/collect_traveled.lua
+++ b/QuestHelper/collect_traveled.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_traveled.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_traveled.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_upgrade.lua b/QuestHelper/collect_upgrade.lua
index 9847144..f04a125 100644
--- a/QuestHelper/collect_upgrade.lua
+++ b/QuestHelper/collect_upgrade.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_upgrade.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_upgrade.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_util.lua b/QuestHelper/collect_util.lua
index 5c7bc90..3978c44 100644
--- a/QuestHelper/collect_util.lua
+++ b/QuestHelper/collect_util.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_util.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_util.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_warp.lua b/QuestHelper/collect_warp.lua
index e24f5b8..d67597a 100644
--- a/QuestHelper/collect_warp.lua
+++ b/QuestHelper/collect_warp.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_warp.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_warp.lua"] = GetTime()
 
diff --git a/QuestHelper/collect_zone.lua b/QuestHelper/collect_zone.lua
index 027b377..ef59f6f 100644
--- a/QuestHelper/collect_zone.lua
+++ b/QuestHelper/collect_zone.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["collect_zone.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["collect_zone.lua"] = GetTime()
 
diff --git a/QuestHelper/comm.lua b/QuestHelper/comm.lua
index 697566f..f133d17 100644
--- a/QuestHelper/comm.lua
+++ b/QuestHelper/comm.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["comm.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["comm.lua"] = GetTime()
 
diff --git a/QuestHelper/config.lua b/QuestHelper/config.lua
index 08674b6..bb99f8e 100644
--- a/QuestHelper/config.lua
+++ b/QuestHelper/config.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["config.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["config.lua"] = GetTime()
 
@@ -927,35 +930,6 @@ function addon:GenerateOptions()
 						type = "description",
 						name = L["PluginIntro"],
 					},
---					Cartographer = {
---						order = 2,
---						type = "group",
---						guiInline = true,
---						name = L["PluginCartographerName"],
---						desc = L["PluginCartographerDesc"],
---						disabled = function()
---							return not Cartographer_Waypoints or QuestHelper_Pref['hide'];
---						end,
---						args = {
---							Arrow = {
---								order = 1,
---								type = "toggle",
---								name = L["CartographerArrowName"],
---								desc = L["CartographerArrowDesc"],
---								get = function(i)
---									return QuestHelper_Pref['cart_wp_new'];
---								end,
---								set = function(i, v)
---									QuestHelper_Pref['cart_wp_new'] = v;
---									if QuestHelper_Pref['cart_wp_new'] then
---										QuestHelper:EnableCartographer();
---									else
---										QuestHelper:DisableCartographer();
---									end
---								end,
---							},
---						},
---					},
 					TomTom = {
 						order = 2,
 						type = "group",
diff --git a/QuestHelper/core.lua b/QuestHelper/core.lua
index a87e026..71354d2 100644
--- a/QuestHelper/core.lua
+++ b/QuestHelper/core.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["core.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["core.lua"] = GetTime()
 
diff --git a/QuestHelper/custom.lua b/QuestHelper/custom.lua
index a3f214a..b96dfca 100644
--- a/QuestHelper/custom.lua
+++ b/QuestHelper/custom.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["custom.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["custom.lua"] = GetTime()
 
diff --git a/QuestHelper/db_get.lua b/QuestHelper/db_get.lua
index 122d5ff..dfb35af 100644
--- a/QuestHelper/db_get.lua
+++ b/QuestHelper/db_get.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["db_get.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["db_get.lua"] = GetTime()
 
diff --git a/QuestHelper/director_achievement.lua b/QuestHelper/director_achievement.lua
index 5ec4585..3603938 100644
--- a/QuestHelper/director_achievement.lua
+++ b/QuestHelper/director_achievement.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["director_achievement.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["director_achievement.lua"] = GetTime()
 
diff --git a/QuestHelper/director_find.lua b/QuestHelper/director_find.lua
index 890fc00..5473cd0 100644
--- a/QuestHelper/director_find.lua
+++ b/QuestHelper/director_find.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["director_find.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["director_find.lua"] = GetTime()
 
diff --git a/QuestHelper/director_quest.lua b/QuestHelper/director_quest.lua
index d7df858..600091a 100644
--- a/QuestHelper/director_quest.lua
+++ b/QuestHelper/director_quest.lua
@@ -1,3 +1,5 @@
+
+local GetTime = QuestHelper_GetTime
 QuestHelper_File["director_quest.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["director_quest.lua"] = GetTime()
 
diff --git a/QuestHelper/dodads.lua b/QuestHelper/dodads.lua
index 21007d3..5898d8d 100644
--- a/QuestHelper/dodads.lua
+++ b/QuestHelper/dodads.lua
@@ -1,3 +1,5 @@
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["dodads.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["dodads.lua"] = GetTime()
 
diff --git a/QuestHelper/dodads_triangles.lua b/QuestHelper/dodads_triangles.lua
index ac8ff1c..09ce4eb 100644
--- a/QuestHelper/dodads_triangles.lua
+++ b/QuestHelper/dodads_triangles.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["dodads_triangles.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["dodads_triangles.lua"] = GetTime()
 
diff --git a/QuestHelper/error.lua b/QuestHelper/error.lua
index 6c5c105..4bdfba4 100644
--- a/QuestHelper/error.lua
+++ b/QuestHelper/error.lua
@@ -249,7 +249,6 @@ function QuestHelper_ErrorCatcher.OnError(o_msg, o_frame, o_stack, o_etype, ...)
       )
       or (
         string.find(debugstack(2, 20, 20), "QuestHelper")  -- We're being a little overzealous and catching any bug with "QuestHelper" in the stack. This possibly should be removed, I'm not sure it's ever caught anything interesting.
-        and not string.find(o_msg, "Cartographer_POI")  -- Cartographer started throwing ridiculous numbers of errors on startup with QH in the stack, and since we caught stuff with QH in the stack, we decided these errors were ours. Urgh. Disabled.
       )
     )
     and not string.match(o_msg, "WTF\\Account\\.*")  -- Sometimes the WTF file gets corrupted. This isn't our fault, since we weren't involved in writing it, and there's also nothing we can do about it - in fact we can't even retrieve the remnants of the old file. We may as well just ignore it. I suppose we could pop up a little dialog saying "clear some space on your hard drive, dufus" but, meh.
diff --git a/QuestHelper/filter_base.lua b/QuestHelper/filter_base.lua
index c3ae369..c530bdf 100644
--- a/QuestHelper/filter_base.lua
+++ b/QuestHelper/filter_base.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["filter_base.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["filter_base.lua"] = GetTime()
 
diff --git a/QuestHelper/filter_core.lua b/QuestHelper/filter_core.lua
index b6f61b3..e80f87b 100644
--- a/QuestHelper/filter_core.lua
+++ b/QuestHelper/filter_core.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["filter_core.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["filter_core.lua"] = GetTime()
 
diff --git a/QuestHelper/flightpath.lua b/QuestHelper/flightpath.lua
index 3fba58b..1255d74 100644
--- a/QuestHelper/flightpath.lua
+++ b/QuestHelper/flightpath.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["flightpath.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["flightpath.lua"] = GetTime()
 
diff --git a/QuestHelper/graph_core.lua b/QuestHelper/graph_core.lua
index 6a45dfe..9400c74 100644
--- a/QuestHelper/graph_core.lua
+++ b/QuestHelper/graph_core.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["graph_core.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["graph_core.lua"] = GetTime()
 
diff --git a/QuestHelper/graph_flightpath.lua b/QuestHelper/graph_flightpath.lua
index 356d618..9d650eb 100644
--- a/QuestHelper/graph_flightpath.lua
+++ b/QuestHelper/graph_flightpath.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["graph_flightpath.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["graph_flightpath.lua"] = GetTime()
 
diff --git a/QuestHelper/help.lua b/QuestHelper/help.lua
index 2948d36..71712e7 100644
--- a/QuestHelper/help.lua
+++ b/QuestHelper/help.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["help.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["help.lua"] = GetTime()
 
@@ -437,25 +440,6 @@ function QuestHelper:ToggleRadar(text)
   end
 end
 
-function QuestHelper:ToggleCartWP()
-  QuestHelper_Pref.cart_wp_new = not QuestHelper_Pref.cart_wp_new
-  if QuestHelper_Pref.cart_wp_new then
-    self:EnableCartographer()
-    if Cartographer_Waypoints then
-      if Waypoint and Waypoint.prototype then
-        self:TextOut("Would use "..self:HighlightText("Cartographer Waypoints").." to show objectives, but another mod is interfering with it.")
-      else
-        self:TextOut(QHFormat("SETTINGS_ARROWLINK_ON", QHText("SETTINGS_ARROWLINK_CART")))
-      end
-    else
-      self:TextOut("Would use "..self:HighlightText("Cartographer Waypoints").." to show objectives, except it doesn't seem to be present.")
-    end
-  else
-    self:DisableCartographer()
-    self:TextOut(QHFormat("SETTINGS_ARROWLINK_OFF", QHText("SETTINGS_ARROWLINK_CART")))
-  end
-end
-
 function QuestHelper:ToggleTomTomWP()
   QuestHelper_Pref.tomtom_wp_new = not QuestHelper_Pref.tomtom_wp_new
   if QuestHelper_Pref.tomtom_wp_new then
@@ -772,10 +756,6 @@ commands =
      "Toggles distance units between metres and yards.",
      {}, QuestHelper.ToggleMetric, QuestHelper},
     
-    {"CARTWP",
-     "Toggles displaying the current objective using Cartographer Waypoints (must be installed separately).",
-      {}, QuestHelper.ToggleCartWP, QuestHelper},
-    
     {"TOMTOM",
      "Toggles displaying the current objective using TomTom (must be installed separately).",
       {}, QuestHelper.ToggleTomTomWP, QuestHelper},
diff --git a/QuestHelper/main.lua b/QuestHelper/main.lua
index f03815f..3d1df56 100644
--- a/QuestHelper/main.lua
+++ b/QuestHelper/main.lua
@@ -1,6 +1,7 @@
 QuestHelper_File["main.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["main.lua"] = GetTime()
 
+local GetTime = QuestHelper_GetTime
 local version_string = QuestHelper_File["main.lua"] -- we pretty much save this only so we can inform the user that they're using a beta version
 
 -- Just to make sure it's always 'seen' (there's nothing that can be seen, but still...), and therefore always updating.
@@ -42,7 +43,6 @@ local QuestHelper_DefaultPref =
   show_ants = true,
   level = 3,
   hide = false,
-  cart_wp_new = false,
   tomtom_wp_new = false,
   arrow = true,
   arrow_locked = false,
@@ -176,8 +176,6 @@ function QuestHelper:UnsetTargetLocation()
 end
 
 local interruptcount = 0   -- counts how many "played gained control" messages we recieve, used for flight paths
-local init_cartographer_later = false
-
 
 local startup_time
 local please_submit_enabled = true
@@ -212,11 +210,6 @@ QH_Event("ADDON_LOADED", function (addonid)
   local expected_files =
     {
       ["bst_pre.lua"] = true,
-      ["bst_post.lua"] = true,
-      ["bst_astrolabe.lua"] = true,
-      ["bst_ctl.lua"] = true,
-      ["bst_libaboutpanel.lua"] = true,
-      ["bst_range.lua"] = true,
       
       ["manager_event.lua"] = true,
       ["manager_achievement.lua"] = true,
@@ -243,7 +236,6 @@ QH_Event("ADDON_LOADED", function (addonid)
       ["flightpath.lua"] = true,
       ["tracker.lua"] = true,
       ["objtips.lua"] = true,
-      ["cartographer.lua"] = true,
       ["tomtom.lua"] = true,
       ["textviewer.lua"] = true,
       ["error.lua"] = true,
@@ -538,10 +530,6 @@ QH_Event("ADDON_LOADED", function (addonid)
         QuestHelper:InitMapButton()
     end
     
-    if QuestHelper_Pref.cart_wp_new then
-      init_cartographer_later = true
-    end
-
     if QuestHelper_Pref.tomtom_wp_new then
       self:EnableTomTom()
     end
@@ -616,12 +604,6 @@ QH_Event("ADDON_LOADED", function (addonid)
       end
     end)
     
-	-- There's a bug in Cartographer where SetMapZoom() or SetMapToCurrentZone(), called in an instance, causes any open menus to instantly close. Questhelper (and in general, anything that uses Astrolabe, and other UI mods as well) call those function every frame if the map is closed. This isn't a performance problem or anything, but it happens to trigger the Cartographer bug.
-	-- Removing Cartographer_InstanceMaps hack.  Warn user.
-	if Cartographer and Cartographer.SetCurrentInstance and Cartographer_InstanceMaps and Cartographer_InstanceMaps.OnEnable then
-		QH_fixedmessage("Cartographer is no longer supported.  Your interface may not work properly in instances.  Please remove Cartographer and restart WoW.")
-	end
-
     QuestHelper.loading_init3:SetPercentage(1.0)  -- victory
     
     QuestHelper_Loadtime["init3_end"] = GetTime()
@@ -921,13 +903,6 @@ Thanks for testing!]], "QuestHelper " .. version_string, 500, 20, 10)
   end
   QHUpdateNagTick() -- These probably shouldn't be in OnUpdate. Eventually I'll move them somewhere cleaner.
   
-  if init_cartographer_later and Cartographer_Waypoints then    -- there has to be a better way to do this
-    init_cartographer_later = false
-    if QuestHelper_Pref.cart_wp_new then
-      self:EnableCartographer()
-    end
-  end
-  
   if not ontaxi and UnitOnTaxi("player") then
     self:flightBegan()
     interruptcount = 0
diff --git a/QuestHelper/manager_achievement.lua b/QuestHelper/manager_achievement.lua
index b6851e9..bb0df0d 100644
--- a/QuestHelper/manager_achievement.lua
+++ b/QuestHelper/manager_achievement.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["manager_achievement.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["manager_achievement.lua"] = GetTime()
 
diff --git a/QuestHelper/manager_completed.lua b/QuestHelper/manager_completed.lua
index 14bc3bc..5be7962 100644
--- a/QuestHelper/manager_completed.lua
+++ b/QuestHelper/manager_completed.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["manager_completed.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["manager_completed.lua"] = GetTime()
 
diff --git a/QuestHelper/manager_event.lua b/QuestHelper/manager_event.lua
index 07c71cf..e1341de 100644
--- a/QuestHelper/manager_event.lua
+++ b/QuestHelper/manager_event.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["manager_event.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["manager_event.lua"] = GetTime()
 
diff --git a/QuestHelper/mapbutton.lua b/QuestHelper/mapbutton.lua
index 39e8332..103552c 100644
--- a/QuestHelper/mapbutton.lua
+++ b/QuestHelper/mapbutton.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["mapbutton.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["mapbutton.lua"] = GetTime()
 
@@ -31,12 +34,6 @@ function QuestHelper:DoSettingsMenu()
     QH_Arrow_PopulateMenu(arrowmenu)
     self:CreateMenuItem(menu, QHText("SETTINGS_ARROWLINK_ARROW")):SetSubmenu(arrowmenu)
     
-    -- Cartographer Waypoints
-    if Cartographer_Waypoints then
-      self:CreateMenuItem(menu, QHFormat("SETTINGS_MENU_CARTWP", QuestHelper_Pref.cart_wp_new and QHText("MENU_DISABLE") or QHText("MENU_ENABLE")))
-                    :SetFunction(self.ToggleCartWP, self)
-    end
-    
     -- TomTom
     if TomTom then
       self:CreateMenuItem(menu, QHFormat("SETTINGS_MENU_TOMTOM", QuestHelper_Pref.tomtom_wp_new and QHText("MENU_DISABLE") or QHText("MENU_ENABLE")))
@@ -253,13 +250,7 @@ function QuestHelper:InitMapButton()
     QH_Hook(button, "OnHide", QuestHelper_WorldMapHidden)
 
     -- Position it on the World Map frame
---~     if Cartographer then
---~         -- If Cartographer is in use, coordinate with their buttons.
-            -- Trouble is, this makes Cartographer's buttons conflict with the Zone Map dropdown.
-            -- Re-enable this if Cartographer ever learns to work with the Zone Map dropdown.
---~         Cartographer:AddMapButton(button, 3)
---~     else
-        -- Otherwise, just put it in the upper right corner
+        -- put it in the upper right corner
         button:SetPoint("TOPRIGHT", WorldMapButton, "TOPRIGHT", -10, -10)
         button:SetFrameLevel(WorldMapButton:GetFrameLevel()+1)
         button:SetFrameStrata("FULLSCREEN")
diff --git a/QuestHelper/menu.lua b/QuestHelper/menu.lua
index 788ceed..fd5a133 100644
--- a/QuestHelper/menu.lua
+++ b/QuestHelper/menu.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["menu.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["menu.lua"] = GetTime()
 
diff --git a/QuestHelper/nag.lua b/QuestHelper/nag.lua
index 8e1ccb8..afd6b54 100644
--- a/QuestHelper/nag.lua
+++ b/QuestHelper/nag.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["nag.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["nag.lua"] = GetTime()
 
diff --git a/QuestHelper/objective.lua b/QuestHelper/objective.lua
index e4ef5ec..1da641c 100644
--- a/QuestHelper/objective.lua
+++ b/QuestHelper/objective.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["objective.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["objective.lua"] = GetTime()
 
diff --git a/QuestHelper/objtips.lua b/QuestHelper/objtips.lua
index 9143a1f..c494e03 100644
--- a/QuestHelper/objtips.lua
+++ b/QuestHelper/objtips.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["objtips.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["objtips.lua"] = GetTime()
 
diff --git a/QuestHelper/pathfinding.lua b/QuestHelper/pathfinding.lua
index e320898..6a1ccfa 100644
--- a/QuestHelper/pathfinding.lua
+++ b/QuestHelper/pathfinding.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["pathfinding.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["pathfinding.lua"] = GetTime()
 
diff --git a/QuestHelper/pattern.lua b/QuestHelper/pattern.lua
index 8ef42d5..17701b2 100644
--- a/QuestHelper/pattern.lua
+++ b/QuestHelper/pattern.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["pattern.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["pattern.lua"] = GetTime()
 
diff --git a/QuestHelper/quest.lua b/QuestHelper/quest.lua
index 21c9434..cfb1618 100644
--- a/QuestHelper/quest.lua
+++ b/QuestHelper/quest.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["quest.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["quest.lua"] = GetTime()
 
diff --git a/QuestHelper/radar.lua b/QuestHelper/radar.lua
index 0f8946c..ec51012 100644
--- a/QuestHelper/radar.lua
+++ b/QuestHelper/radar.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["radar.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["radar.lua"] = GetTime()
 
diff --git a/QuestHelper/recycle.lua b/QuestHelper/recycle.lua
index 528a48a..a89e67b 100644
--- a/QuestHelper/recycle.lua
+++ b/QuestHelper/recycle.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["recycle.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["recycle.lua"] = GetTime()
 
diff --git a/QuestHelper/routing.lua b/QuestHelper/routing.lua
index 8a7000b..a42f0bf 100644
--- a/QuestHelper/routing.lua
+++ b/QuestHelper/routing.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["routing.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["routing.lua"] = GetTime()
 
diff --git a/QuestHelper/routing_controller.lua b/QuestHelper/routing_controller.lua
index 78a1048..2c51489 100644
--- a/QuestHelper/routing_controller.lua
+++ b/QuestHelper/routing_controller.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["routing_controller.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["routing_controller.lua"] = GetTime()
 
diff --git a/QuestHelper/routing_core.lua b/QuestHelper/routing_core.lua
index b1404cf..f3778b5 100644
--- a/QuestHelper/routing_core.lua
+++ b/QuestHelper/routing_core.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["routing_core.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["routing_core.lua"] = GetTime()
 
diff --git a/QuestHelper/routing_debug.lua b/QuestHelper/routing_debug.lua
index 908ff3c..37caccb 100644
--- a/QuestHelper/routing_debug.lua
+++ b/QuestHelper/routing_debug.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["routing_debug.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["routing_debug.lua"] = GetTime()
 
diff --git a/QuestHelper/routing_hidden.lua b/QuestHelper/routing_hidden.lua
index 04973d7..3d84ec9 100644
--- a/QuestHelper/routing_hidden.lua
+++ b/QuestHelper/routing_hidden.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["routing_hidden.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["routing_hidden.lua"] = GetTime()
 
diff --git a/QuestHelper/routing_loc.lua b/QuestHelper/routing_loc.lua
index 3bd71b2..7daa17e 100644
--- a/QuestHelper/routing_loc.lua
+++ b/QuestHelper/routing_loc.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["routing_loc.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["routing_loc.lua"] = GetTime()
 
diff --git a/QuestHelper/routing_route.lua b/QuestHelper/routing_route.lua
index 0085fe4..144aa59 100644
--- a/QuestHelper/routing_route.lua
+++ b/QuestHelper/routing_route.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["routing_route.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["routing_route.lua"] = GetTime()
 
diff --git a/QuestHelper/teleport.lua b/QuestHelper/teleport.lua
index f048912..7cc2746 100644
--- a/QuestHelper/teleport.lua
+++ b/QuestHelper/teleport.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["teleport.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["teleport.lua"] = GetTime()
 
diff --git a/QuestHelper/textviewer.lua b/QuestHelper/textviewer.lua
index a936e5c..07c6c0a 100644
--- a/QuestHelper/textviewer.lua
+++ b/QuestHelper/textviewer.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["textviewer.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["textviewer.lua"] = GetTime()
 
diff --git a/QuestHelper/timeslice.lua b/QuestHelper/timeslice.lua
index 8acec41..e82c91f 100644
--- a/QuestHelper/timeslice.lua
+++ b/QuestHelper/timeslice.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["timeslice.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["timeslice.lua"] = GetTime()
 
diff --git a/QuestHelper/tomtom.lua b/QuestHelper/tomtom.lua
index 3c08aca..cf30a48 100644
--- a/QuestHelper/tomtom.lua
+++ b/QuestHelper/tomtom.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["tomtom.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["tomtom.lua"] = GetTime()
 
diff --git a/QuestHelper/tooltip.lua b/QuestHelper/tooltip.lua
index ff714fd..421802a 100644
--- a/QuestHelper/tooltip.lua
+++ b/QuestHelper/tooltip.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["tooltip.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["tooltip.lua"] = GetTime()
 
diff --git a/QuestHelper/tracker.lua b/QuestHelper/tracker.lua
index 3a578a3..8628371 100644
--- a/QuestHelper/tracker.lua
+++ b/QuestHelper/tracker.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["tracker.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["tracker.lua"] = GetTime()
 
diff --git a/QuestHelper/upgrade.lua b/QuestHelper/upgrade.lua
index 03133b8..98c8540 100644
--- a/QuestHelper/upgrade.lua
+++ b/QuestHelper/upgrade.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["upgrade.lua"] = "4.0.1.$svnversion$"
 local my_version = QuestHelper_File["upgrade.lua"]
 
@@ -371,12 +374,6 @@ function QuestHelper_BuildZoneLookup()
   if built then return end
   built = true
   
-  local cartugh
-  if Cartographer_Notes and not Cartographer_Notes.fixed_that_bug_that_causes_POI_to_crash_when_you_change_to_hrothgars_landing then
-    cartugh = Cartographer_Notes.SetNote
-    Cartographer_Notes.SetNote = function () end -- cartographer why are you terrible
-  end
-  
   if GetMapContinents and GetMapZones then
     -- Called from inside the WoW client.
     
@@ -472,9 +469,6 @@ function QuestHelper_BuildZoneLookup()
     QuestHelper:Assert(QuestHelper:ZoneSanity())
   end
   
-  if Cartographer_Notes and not Cartographer_Notes.fixed_that_bug_that_causes_POI_to_crash_when_you_change_to_hrothgars_landing then
-    Cartographer_Notes.SetNote = cartugh
-  end
   -- We are broken by the time we get here. Time to turn these TextOut's to Errors.
   QuestHelper:Assert(QuestHelper:ZoneSanity())
 end
diff --git a/QuestHelper/utility.lua b/QuestHelper/utility.lua
index c1b6aad..8836c82 100644
--- a/QuestHelper/utility.lua
+++ b/QuestHelper/utility.lua
@@ -1,3 +1,9 @@
+function QuestHelper_GetTime()
+  return debugprofilestop() / 1000
+end
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["utility.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["utility.lua"] = GetTime()
 
diff --git a/QuestHelper/warning.lua b/QuestHelper/warning.lua
index 6a197c3..07cfcc9 100644
--- a/QuestHelper/warning.lua
+++ b/QuestHelper/warning.lua
@@ -1,3 +1,6 @@
+
+local GetTime = QuestHelper_GetTime
+
 QuestHelper_File["warning.lua"] = "4.0.1.$svnversion$"
 QuestHelper_Loadtime["warning.lua"] = GetTime()
 
@@ -241,7 +244,6 @@ function QuestHelper_WarningCatcher.OnWarning(o_msg, o_frame, o_stack, o_etype,
       )
       or (
         string.find(debugstack(2, 20, 20), "QuestHelper")  -- We're being a little overzealous and catching any bug with "QuestHelper" in the stack. This possibly should be removed, I'm not sure it's ever caught anything interesting.
-        and not string.find(o_msg, "Cartographer_POI")  -- Cartographer started throwing ridiculous numbers of warnings on startup with QH in the stack, and since we caught stuff with QH in the stack, we decided these warnings were ours. Urgh. Disabled.
       )
     )
     and not string.match(o_msg, "WTF\\Account\\.*")  -- Sometimes the WTF file gets corrupted. This isn't our fault, since we weren't involved in writing it, and there's also nothing we can do about it - in fact we can't even retrieve the remnants of the old file. We may as well just ignore it. I suppose we could pop up a little dialog saying "clear some space on your hard drive, dufus" but, meh.