diff --git a/BuyFrame.lua b/BuyFrame.lua
index 03ecf2d..df05f9e 100644
--- a/BuyFrame.lua
+++ b/BuyFrame.lua
@@ -1368,7 +1368,6 @@ end
 -- Mouse has left a row in the scrolling frame.
 function AuctionLite:BuyButton_OnLeave(widget)
   GameTooltip:Hide();
-  BattlePetTooltip:Hide();
 end
 
 -- Click the advanced menu button.
@@ -1496,7 +1495,6 @@ end
 -- Hide the cancel tooltip.
 function AuctionLite:BuyCancelAuctionButton_OnLeave(widget)
   GameTooltip:Hide();
-  BattlePetTooltip:Hide();
 end
 
 -- Starts a full scan of the auction house.
diff --git a/CreateAuctions.lua b/CreateAuctions.lua
index 4a8da49..504cd78 100644
--- a/CreateAuctions.lua
+++ b/CreateAuctions.lua
@@ -36,11 +36,6 @@ function AuctionLite:CountItems(targetLink)
         end
       end
     end
-
-    -- Battle pets can only be sold one at a time, so cap this count at one.
-    if total > 0 and self:IsBattlePetLink(targetLink) then
-      total = 1;
-    end
   end
 
   return total;
diff --git a/SellFrame.lua b/SellFrame.lua
index 9d37690..5233d25 100644
--- a/SellFrame.lua
+++ b/SellFrame.lua
@@ -631,7 +631,6 @@ end
 -- Mouse has left a row in the scrolling frame.
 function AuctionLite:SellButton_OnLeave(widget)
   GameTooltip:Hide();
-  BattlePetTooltip:Hide();
 end
 
 -- Handles clicks on "Remember" button.
diff --git a/Tooltip.lua b/Tooltip.lua
index 50b8f95..2855e3e 100644
--- a/Tooltip.lua
+++ b/Tooltip.lua
@@ -386,19 +386,11 @@ function AuctionLite:SetAuctionLiteTooltip(widget, shift, link, count)
     else
       assert(false);
     end
-    if self:IsBattlePetLink(link) then
-      local _, speciesId, level, breedQuality, maxHealth, power, speed, name =
-        strsplit(":", link);
-      BattlePetToolTip_Show(tonumber(speciesId), tonumber(level),
-                            tonumber(breedQuality), tonumber(maxHealth),
-                            tonumber(power), tonumber(speed), name);
-    else
-      GameTooltip:SetHyperlink(link);
-      if GameTooltip:NumLines() > 0 then
-        self:AddTooltipData(GameTooltip, link, count);
-      end
-      self:SetHyperlinkTooltips(true);
+    GameTooltip:SetHyperlink(link);
+    if GameTooltip:NumLines() > 0 then
+      self:AddTooltipData(GameTooltip, link, count);
     end
+    self:SetHyperlinkTooltips(true);
   end
 end
 
@@ -426,7 +418,7 @@ end
 function AuctionLite:AddHooksToTooltip(tooltip)
   self:SecureHook(tooltip, "SetBagItem", "BagTooltip");
   self:SecureHook(tooltip, "SetInventoryItem", "InventoryTooltip");
-  self:SecureHook(tooltip, "SetGuildBankItem", "GuildBankTooltip");
+--  self:SecureHook(tooltip, "SetGuildBankItem", "GuildBankTooltip");
   --self:SecureHook(tooltip, "SetTradeSkillItem", "TradeSkillTooltip");
   self:SecureHook(tooltip, "SetMerchantItem", "MerchantTooltip");
   self:SecureHook(tooltip, "SetBuybackItem", "BuybackTooltip");
diff --git a/Util.lua b/Util.lua
index 58bb602..d7e1119 100644
--- a/Util.lua
+++ b/Util.lua
@@ -105,11 +105,6 @@ function AuctionLite:IsLink(str)
   return (str:find(LinkRegexp) ~= nil);
 end
 
--- Is this link a battle pet link?
-function AuctionLite:IsBattlePetLink(link)
-  return strmatch(link, "|Hbattlepet:");
-end
-
 -- Dissect an item link or item string.
 function AuctionLite:SplitLink(link)
   -- Parse the link.
@@ -149,10 +144,6 @@ end
 -- Zero out the suffixId field from an item link, and also replace the name with the un-suffixed name.
 function AuctionLite:RemoveSuffix(link)
   if link ~= nil then
-    if AuctionLite:IsBattlePetLink(link) then
-      return link
-    end
-    
     local name, _, id = AuctionLite:SplitLink(link)
     local baseName = GetItemInfo(id)
     return link:gsub(