--- a/ObjectiveEvents.lua	Wed Apr 06 07:54:19 2016 -0400
+++ b/ObjectiveEvents.lua	Fri Apr 08 06:12:05 2016 -0400
@@ -18,19 +18,26 @@
     mod:Update(0x00000003)
 end
 
+local Quest = mod.Quest
 mod.RemoveQuestWatch = function(questIndex, ...)
   print('|cFFFF8800RemoveQuestWatch', questIndex, ...)
+
   local info = mod.Quest.LogInfo[questIndex]
 
   -- remove quest refs
-  mod.Quest.LogBlock[questIndex] = nil
-  mod.Quest.QuestBlock[info.questID] = nil
+  local block = Quest.QuestBlock[info.questID]
+  Quest.QuestBlock[info.questID] = nil
+  Quest.LogBlock[questIndex] = nil
 
   -- remove if they still match
-  if mod.Quest.WatchInfo[info.watchIndex] == info then
+  if Quest.WatchInfo[info.watchIndex] == info then
     print('cleaning dead WatchInfo entry')
-    mod.Quest.WatchInfo[info.watchIndex] = nil
+    Quest.WatchInfo[info.watchIndex] = nil
   end
+  for i = 1, #info.objectives do
+    Quest.lines[block.blockIndex][i]:Hide()
+  end
+
   mod:Update(OBJECTIVE_TRACKER_UPDATE_MODULE_QUEST)
 end
 
@@ -68,5 +75,5 @@
 
 
 mod.SetSuperTrackedQuestID = function(questID)
-  mod:Update()
+  --mod:Update()
 end
\ No newline at end of file