diff --git a/ItemRack/ItemRack.lua b/ItemRack/ItemRack.lua
index 72b95a7..c7d497a 100644
--- a/ItemRack/ItemRack.lua
+++ b/ItemRack/ItemRack.lua
@@ -100,7 +100,7 @@ ItemRackItems = {
 }
 
 ItemRack.NoTitansGrip = {
-	--["Polearms"] = 1, -- 3.3.5 / Wrath Classic support Polearm Titan's Grip
+	["Polearms"] = 1, -- reverted in 3.4.1 to block Polearms from Titan's Grip again
 	["Fishing Poles"] = 1,
 	["Staves"] = 1
 }
diff --git a/ItemRack/ItemRackQueue.lua b/ItemRack/ItemRackQueue.lua
index b32cf1e..d797023 100644
--- a/ItemRack/ItemRackQueue.lua
+++ b/ItemRack/ItemRackQueue.lua
@@ -86,6 +86,7 @@ end
 
 function ItemRack.ItemNearReady(id)
 	local start,duration = GetItemCooldown(id)
+	if not tonumber(start) then return end -- can return nil shortly after loading screen
 	if start==0 or math.max(start + duration - GetTime(),0)<=30 then
 		return true
 	end
diff --git a/ItemRack/ItemRack_Wrath.toc b/ItemRack/ItemRack_Wrath.toc
deleted file mode 100644
index c12e0ff..0000000
--- a/ItemRack/ItemRack_Wrath.toc
+++ /dev/null
@@ -1,19 +0,0 @@
-## Interface: 30401
-## Title: ItemRack - Classic
-## Version: 2.75
-## Author: Gello - Updated for Classic by Rottenbeer,Roadblock
-## SavedVariables: ItemRackSettings, ItemRackItems, ItemRackEvents
-## SavedVariablesPerCharacter: ItemRackUser
-## OptionalDeps: Masque
-## X-Curse-Project-ID: 340903
-
-# Libraries
-Libs\Libs.xml
-
-ItemRack.lua
-ItemRack.xml
-ItemRackButtons.lua
-ItemRackButtons.xml
-ItemRackEquip.lua
-ItemRackQueue.lua
-ItemRackEvents.lua
diff --git a/ItemRackOptions/ItemRackOptions_Wrath.toc b/ItemRackOptions/ItemRackOptions_Wrath.toc
deleted file mode 100644
index d949483..0000000
--- a/ItemRackOptions/ItemRackOptions_Wrath.toc
+++ /dev/null
@@ -1,12 +0,0 @@
-## Interface: 30401
-## Title: ItemRackOptions
-## Notes: Load-On-Demand modules for ItemRack
-## Dependencies: ItemRack, Blizzard_MacroUI
-## LoadOnDemand: 1
-## X-Curse-Project-ID: 340903
-
-# Libraries
-Libs\Libs.xml
-
-ItemRackOptions.lua
-ItemRackOptions.xml