diff --git a/colors.lua b/colors.lua
index d6541de0c..44da8f814 100644
--- a/colors.lua
+++ b/colors.lua
@@ -18,14 +18,6 @@ local colors = {
 	reaction = {},
 }
 
-if(not WoW41) then
-	colors.happiness = {
-		[1] = {1, 0, 0}, -- need.... | unhappy
-		[2] = {1, 1, 0}, -- new..... | content
-		[3] = {0, 1, 0}, -- colors.. | happy
-	}
-end
-
 -- We do this because people edit the vars directly, and changing the default
 -- globals makes SPICE FLOW!
 if(IsAddOnLoaded'!ClassColors' and CUSTOM_CLASS_COLORS) then
diff --git a/elements/happiness.lua b/elements/happiness.lua
deleted file mode 100644
index e5d86575e..000000000
--- a/elements/happiness.lua
+++ /dev/null
@@ -1,65 +0,0 @@
-local WoW41 = select(4, GetBuildInfo()) == 40100
-if(WoW41) then return end
-
-local parent, ns = ...
-local oUF = ns.oUF
-
-local Update = function(self, event, unit, powerType)
-	if(self.unit ~= unit) then return end
-
-	local happ = self.Happiness
-	if(happ and (powerType == 'HAPPINESS' or not powerType)) then
-		local happiness = GetPetHappiness()
-		local _, hunterPet = HasPetUI()
-
-		if(not (happiness or hunterPet)) then
-			return happ:Hide()
-		end
-
-		happ:Show()
-		if(happiness == 1) then
-			happ:SetTexCoord(0.375, 0.5625, 0, 0.359375)
-		elseif(happiness == 2) then
-			happ:SetTexCoord(0.1875, 0.375, 0, 0.359375)
-		elseif(happiness == 3) then
-			happ:SetTexCoord(0, 0.1875, 0, 0.359375)
-		end
-
-		if(happ.PostUpdate) then
-			return happ:PostUpdate(unit, happiness)
-		end
-	end
-end
-
-local Path = function(self, ...)
-	return (self.Happiness.Override or Update) (self, ...)
-end
-
-local ForceUpdate = function(element)
-	return Path(element.__owner, 'ForceUpdate', element.__owner.unit)
-end
-
-local Enable = function(self)
-	local happiness = self.Happiness
-	if(happiness) then
-		happiness.__owner = self
-		happiness.ForceUpdate = ForceUpdate
-
-		self:RegisterEvent('UNIT_POWER', Path)
-
-		if(happiness:IsObjectType"Texture" and not happiness:GetTexture()) then
-			happiness:SetTexture[[Interface\PetPaperDollFrame\UI-PetHappiness]]
-		end
-
-		return true
-	end
-end
-
-local Disable = function(self)
-	local happiness = self.Happiness
-	if(happiness) then
-		self:UnregisterEvent('UNIT_POWER', Path)
-	end
-end
-
-oUF:AddElement('Happiness', Path, Enable, Disable)
diff --git a/elements/health.lua b/elements/health.lua
index 895296141..a1c6451f7 100644
--- a/elements/health.lua
+++ b/elements/health.lua
@@ -1,5 +1,3 @@
-local WoW41 = select(4, GetBuildInfo()) == 40100
-
 local parent, ns = ...
 local oUF = ns.oUF
 
@@ -28,8 +26,6 @@ local Update = function(self, event, unit, powerType)
 		t = self.colors.tapped
 	elseif(health.colorDisconnected and not UnitIsConnected(unit)) then
 		t = self.colors.disconnected
-	elseif(not WoW41 and health.colorHappiness and UnitIsUnit(unit, "pet") and GetPetHappiness()) then
-		t = self.colors.happiness[GetPetHappiness()]
 	elseif(health.colorClass and UnitIsPlayer(unit)) or
 		(health.colorClassNPC and not UnitIsPlayer(unit)) or
 		(health.colorClassPet and UnitPlayerControlled(unit) and not UnitIsPlayer(unit)) then
diff --git a/elements/power.lua b/elements/power.lua
index 20a359c74..d22589a57 100644
--- a/elements/power.lua
+++ b/elements/power.lua
@@ -1,5 +1,3 @@
-local WoW41 = select(4, GetBuildInfo()) == 40100
-
 local parent, ns = ...
 local oUF = ns.oUF
 
@@ -33,8 +31,6 @@ local Update = function(self, event, unit)
 		t = self.colors.tapped
 	elseif(power.colorDisconnected and not UnitIsConnected(unit)) then
 		t = self.colors.disconnected
-	elseif(not WoW41 and power.colorHappiness and UnitIsUnit(unit, "pet") and GetPetHappiness()) then
-		t = self.colors.happiness[GetPetHappiness()]
 	elseif(power.colorPower) then
 		local ptype, ptoken, altR, altG, altB = UnitPowerType(unit)
 
diff --git a/elements/tags.lua b/elements/tags.lua
index 7a3d9b780..d584a3e09 100644
--- a/elements/tags.lua
+++ b/elements/tags.lua
@@ -2,8 +2,6 @@
 -- Credits: Vika, Cladhaire, Tekkub
 ]]
 
-local WoW41 = select(4, GetBuildInfo()) == 40100
-
 local parent, ns = ...
 local oUF = ns.oUF
 
@@ -343,25 +341,6 @@ local tagEvents = {
 	["pereclipse"]          = 'UNIT_POWER',
 }
 
-if(not WoW41) then
-	tagStrings['happiness'] = [[function(u)
-		if(UnitIsUnit(u, 'pet')) then
-			local happiness = GetPetHappiness()
-			if(happiness == 1) then
-				return ":<"
-			elseif(happiness == 2) then
-				return ":|"
-			elseif(happiness == 3) then
-				return ":D"
-			end
-		end
-	end]]
-
-	tagEvents['happiness'] = 'UNIT_POWER'
-end
-
-
-
 local unitlessEvents = {
 	PLAYER_LEVEL_UP = true,
 	PLAYER_UPDATE_RESTING = true,
diff --git a/oUF.xml b/oUF.xml
index 9f3b19ea4..ab2f184b0 100644
--- a/oUF.xml
+++ b/oUF.xml
@@ -20,7 +20,6 @@
 	<Script file='elements\pvp.lua' />
 	<Script file='elements\portraits.lua' />
 	<Script file='elements\range.lua' />
-	<Script file='elements\happiness.lua' />
 	<Script file='elements\castbar.lua' />
 	<Script file='elements\threat.lua' />
 	<Script file='elements\tags.lua' />