diff --git a/Modules/HolyPower/HolyPower.lua b/Modules/HolyPower/HolyPower.lua
index 93ac019b..854c5035 100755
--- a/Modules/HolyPower/HolyPower.lua
+++ b/Modules/HolyPower/HolyPower.lua
@@ -8,7 +8,6 @@ local L = PitBull4.L
 -- CONSTANTS ----------------------------------------------------------------
 
 local SPELL_POWER_HOLY_POWER = 9 -- Enum.PowerType.HolyPower
-local SPEC_PALADIN_RETRIBUTION = _G.SPEC_PALADIN_RETRIBUTION
 
 local MAX_POWER = 5
 
diff --git a/Modules/PhaseIcon/PhaseIcon.lua b/Modules/PhaseIcon/PhaseIcon.lua
index a2c5a2d7..4ce88e46 100755
--- a/Modules/PhaseIcon/PhaseIcon.lua
+++ b/Modules/PhaseIcon/PhaseIcon.lua
@@ -28,11 +28,8 @@ end
 
 function PitBull4_PhaseIcon:OnEnter()
 	local unit = self:GetParent().unit
-	local tooltip = _G.PARTY_PHASED_MESSAGE
 	local phaseReason = UnitPhaseReason(unit)
-	if phaseReason then
-		tooltip = PartyUtil.GetPhasedReasonString(phaseReason, unit)
-	end
+	local tooltip = PartyUtil.GetPhasedReasonString(phaseReason, unit) or _G.PARTY_PHASED_MESSAGE
 	GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
 	GameTooltip:SetText(tooltip, nil, nil, nil, nil, true)
 	GameTooltip:Show()
diff --git a/Modules/SoulShards/Controls.lua b/Modules/SoulShards/Controls.lua
index e7771b9d..e74ad1d6 100755
--- a/Modules/SoulShards/Controls.lua
+++ b/Modules/SoulShards/Controls.lua
@@ -1,6 +1,5 @@
 
 local PitBull4 = _G.PitBull4
-local is_725 = _G.ClassNameplateBarWarlockShardMixin and true
 
 -- CONSTANTS ----------------------------------------------------------------
 
@@ -60,31 +59,6 @@ function SoulShard:Update(powerAmount)
 	end
 end
 
-if not is_725 then
-	function SoulShard:Setup(id)
-		self.shardIndex = id
-	end
-
-	function SoulShard:Update(powerAmount)
-		local fillAmount = min(max(powerAmount - self.shardIndex, 0), 1)
-		local active = fillAmount >= 1
-
-		if fillAmount ~= self.fillAmount then
-			self.fillAmount = fillAmount
-			self.shine.ag:Stop()
-			self.shine:SetAlpha(0)
-			if active then
-				self.shine.ag:Play()
-				self.texture:SetDesaturated(false)
-				self.texture:SetAlpha(READY_ALPHA)
-			else
-				self.texture:SetDesaturated(true)
-				self.texture:SetAlpha(UNREADY_ALPHA)
-			end
-		end
-	end
-end
-
 function SoulShard_scripts:OnEnter()
 	GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
 	GameTooltip:SetText(_G.SOUL_SHARDS_POWER)
@@ -98,33 +72,6 @@ end
 
 PitBull4.Controls.MakeNewControlType("SoulShard", "Frame", function(control)
 	-- onCreate
-	if not is_725 then
-		local texture = PitBull4.Controls.MakeTexture(control, "ARTWORK")
-		control.texture = texture
-		texture:SetAllPoints(control)
-		texture:SetTexture(ICON_TEXTURE)
-
-		local shine = PitBull4.Controls.MakeAnimatedTexture(control, "OVERLAY")
-		control.shine = shine
-		shine:SetAllPoints(control)
-		shine:SetTexture(SHINE_TEXTURE)
-		shine:SetBlendMode("ADD")
-		shine:SetVertexColor(unpack(PitBull4.PowerColors["SOUL_SHARDS"]))
-		shine:SetAlpha(0)
-
-		local fade_in = PitBull4.Controls.MakeAlpha(shine.ag)
-		fade_in:SetDuration(SHINE_HALF_TIME)
-		fade_in:SetFromAlpha(0)
-		fade_in:SetToAlpha(1)
-		fade_in:SetOrder(1)
-
-		local fade_out = PitBull4.Controls.MakeAlpha(shine.ag)
-		fade_out:SetDuration(SHINE_HALF_TIME)
-		fade_out:SetFromAlpha(1)
-		fade_out:SetToAlpha(0)
-		fade_out:SetOrder(2)
-	end
-
 	for k, v in pairs(SoulShard) do
 		control[k] = v
 	end
@@ -142,4 +89,4 @@ end, function(control)
 	control.shardIndex = nil
 	control.fillAmount = nil
 
-end, is_725 and "ClassNameplateBarShardFrame")
+end, "ClassNameplateBarShardFrame")
diff --git a/Modules/SoulShards/SoulShards.lua b/Modules/SoulShards/SoulShards.lua
index e626a8ba..6c7152aa 100755
--- a/Modules/SoulShards/SoulShards.lua
+++ b/Modules/SoulShards/SoulShards.lua
@@ -4,7 +4,6 @@ end
 
 local PitBull4 = _G.PitBull4
 local L = PitBull4.L
-local is_725 = _G.ClassNameplateBarWarlockShardMixin and true
 
 -- CONSTANTS ----------------------------------------------------------------
 
@@ -12,10 +11,10 @@ local SPELL_POWER_SOUL_SHARDS = 7 -- Enum.PowerType.SoulShards
 
 local MAX_SHARDS = 5
 
-local STANDARD_WIDTH  = is_725 and 17 or 15
-local STANDARD_HEIGHT = is_725 and 22 or 15
+local STANDARD_WIDTH = 17
+local STANDARD_HEIGHT = 22
 local BORDER_SIZE = 3
-local SPACING = is_725 and 6 or 3
+local SPACING = 6
 
 local HALF_STANDARD_WIDTH = STANDARD_WIDTH / 2
 local HALF_STANDARD_HEIGHT = STANDARD_HEIGHT / 2