diff --git a/Skin/Classic/Interface/FrameXML/MailFrame.lua b/Skin/Classic/Interface/FrameXML/MailFrame.lua
index 51648ca3..353d0528 100644
--- a/Skin/Classic/Interface/FrameXML/MailFrame.lua
+++ b/Skin/Classic/Interface/FrameXML/MailFrame.lua
@@ -276,26 +276,6 @@ function private.FrameXML.MailFrame()
 
 
     --Skin.WowClassicScrollBar(_G.MailEditBoxScrollBar)
-    if not private.hasAPI then
-        Skin.UIPanelScrollFrameTemplate(_G.SendMailScrollFrame)
-        _G.SendMailScrollFrame:SetPoint("TOPLEFT", 10, -83)
-        _G.SendMailScrollFrame:SetWidth(298)
-
-        _G.SendStationeryBackgroundLeft:Hide()
-        _G.SendStationeryBackgroundRight:Hide()
-        _G.SendScrollBarBackgroundTop:Hide()
-        select(4, _G.SendMailScrollFrame:GetRegions()):Hide() -- SendScrollBarBackgroundBottom
-
-        local sendScrollBG = _G.CreateFrame("Frame", nil, _G.SendMailScrollFrame)
-        sendScrollBG:SetFrameLevel(_G.SendMailScrollFrame:GetFrameLevel() - 1)
-        sendScrollBG:SetPoint("TOPLEFT", 0, 2)
-        sendScrollBG:SetPoint("BOTTOMRIGHT", 20, -2)
-        Base.SetBackdrop(sendScrollBG, Color.frame)
-
-        _G.SendMailScrollChildFrame:SetSize(298, 257)
-        _G.SendMailBodyEditBox:SetPoint("TOPLEFT", 2, -2)
-        _G.SendMailBodyEditBox:SetWidth(298)
-    end
 
     -- BlizzWTF: these should use InputBoxTemplate
     Skin.SendMailInputBox(_G.SendMailNameEditBox)
diff --git a/Skin/Classic/Interface_TBC/FrameXML/UIParent.lua b/Skin/Classic/Interface_TBC/FrameXML/UIParent.lua
index 95e0d653..3ec2b184 100644
--- a/Skin/Classic/Interface_TBC/FrameXML/UIParent.lua
+++ b/Skin/Classic/Interface_TBC/FrameXML/UIParent.lua
@@ -28,4 +28,3 @@ function private.FrameXML.UIParent()
     _G.hooksecurefunc("SetPortraitToTexture", Hook.SetPortraitToTexture)
     _G.hooksecurefunc("BuildIconArray", Hook.BuildIconArray)
 end
-print("UIParent", private.FrameXML.UIParent)
diff --git a/Skin/Retail/Interface/FrameXML/InterfaceOptionsPanels.lua b/Skin/Retail/Interface/FrameXML/InterfaceOptionsPanels.lua
index 1977c55a..156c59bc 100644
--- a/Skin/Retail/Interface/FrameXML/InterfaceOptionsPanels.lua
+++ b/Skin/Retail/Interface/FrameXML/InterfaceOptionsPanels.lua
@@ -41,7 +41,7 @@ function private.FrameXML.InterfaceOptionsPanels()
     ------------
     -- Combat --
     ------------
-    local CombatPanel = InterfaceOptionsCombatPanel
+    local CombatPanel = _G.InterfaceOptionsCombatPanel
     Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsCombatPanelTargetOfTarget)
     Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsCombatPanelFlashLowHealthWarning)
     Skin.InterfaceOptionsCheckButtonTemplate(CombatPanel.EnableMouseoverCastCheckbox)