diff --git a/compat/tbc.lua b/compat/tbc.lua
index 781749c6..7feff703 100644
--- a/compat/tbc.lua
+++ b/compat/tbc.lua
@@ -1,13 +1,6 @@
 -- load pfUI environment
 setfenv(1, pfUI:GetEnvironment())
-
-if pfUI.client < 20000 or pfUI.client > 20400 then return end
-DEFAULT_CHAT_FRAME:AddMessage("Compatibility Mode for |cff33ffccTBC |cffffff002.4.3|r has been loaded. Good Luck!")
-
--- blacklist unrequired modules
-pfUI.module.autoshift = true
-pfUI.module.itemclick = true
-pfUI.module.hdgraphic = true
+if pfUI.expansion ~= "tbc" then return end
 
 -- [[ Constants ]]--
 CASTBAR_EVENT_CAST_DELAY = "UNIT_SPELLCAST_DELAYED"
diff --git a/compat/vanilla.lua b/compat/vanilla.lua
index db9e65a6..e6a22360 100644
--- a/compat/vanilla.lua
+++ b/compat/vanilla.lua
@@ -1,7 +1,6 @@
 -- load pfUI environment
 setfenv(1, pfUI:GetEnvironment())
-
-if pfUI.client > 11200 then return end
+if pfUI.expansion ~= "vanilla" then return end
 
 -- [[ Constants ]]--
 CASTBAR_EVENT_CAST_DELAY = "SPELLCAST_DELAYED"