diff --git a/components/post.lua b/components/post.lua
index 3a185ba..9d519bf 100644
--- a/components/post.lua
+++ b/components/post.lua
@@ -30,7 +30,7 @@ function private.post_auction(slot, k)
 		ClearCursor()
 		ClickAuctionSellItemButton()
 		ClearCursor()
-		aux.orig.PickupContainerItem(unpack(slot))
+		PickupContainerItem(unpack(slot))
 		ClickAuctionSellItemButton()
 		ClearCursor()
 
diff --git a/components/stack.lua b/components/stack.lua
index 46a922b..6188dcf 100644
--- a/components/stack.lua
+++ b/components/stack.lua
@@ -61,7 +61,7 @@ function private.move_item(from_slot, to_slot, amount, k)
 
 	ClearCursor()
 	SplitContainerItem(from_slot[1], from_slot[2], amount)
-	aux.orig.PickupContainerItem(unpack(to_slot))
+	PickupContainerItem(unpack(to_slot))
 
 	return aux.control.when(function() return m.stack_size(to_slot) == expected_size end, k)
 end
diff --git a/core.lua b/core.lua
index 4f73a51..dd28cfe 100644
--- a/core.lua
+++ b/core.lua
@@ -41,7 +41,7 @@ function public.tab(index, title, name)
 	tab.module[2].ACTIVE = function()
 		return tab == m.active_tab()
 	end
-	for _, handler in {'OPEN', 'CLOSE', 'CLICK_LINK', 'PICKUP_ITEM', 'USE_ITEM'} do
+	for _, handler in {'OPEN', 'CLOSE', 'CLICK_LINK', 'USE_ITEM'} do
 		tab.module[3][handler] = nil
 	end
 	m.tabs[index] = tab
@@ -111,7 +111,7 @@ function public.VARIABLES_LOADED()
 		btn:SetWidth(65)
 		btn:SetHeight(24)
 		btn:SetText('Close')
-		btn:SetScript('OnClick', m._(HideUIPanel, m.frame))
+		btn:SetScript('OnClick', m._(m.frame.hide, m.frame))
 		public.close_button = btn
 	end
 
@@ -169,7 +169,6 @@ function m.ADDON_LOADED.Blizzard_AuctionUI()
 	end)
 
 	m.hook('GetOwnerAuctionItems', m.GetOwnerAuctionItems)
-	m.hook('PickupContainerItem', m.PickupContainerItem)
 	m.hook('SetItemRef', m.SetItemRef)
 	m.hook('UseContainerItem', m.UseContainerItem)
 	m.hook('AuctionFrameAuctions_OnEvent', m.AuctionFrameAuctions_OnEvent)
@@ -288,15 +287,6 @@ function private.SetItemRef(...)
 	end
 end
 
-function private.PickupContainerItem(...)
-	if m.modified() or not m.index(m.active_tab(), 'module', 1, 'PICKUP_ITEM') then
-		return m.orig.PickupContainerItem(unpack(arg))
-	end
-	for _, item_info in {m.info.container_item(arg[1], arg[2])} do
-		return m.active_tab.module[1].PICKUP_ITEM(item_info)
-	end
-end
-
 function private.UseContainerItem(...)
     if m.modified() or not m.index(m.active_tab(), 'module', 1, 'USE_ITEM') then
         return m.orig.UseContainerItem(unpack(arg))
diff --git a/tabs/post/core.lua b/tabs/post/core.lua
index 1a98061..c3fcd94 100644
--- a/tabs/post/core.lua
+++ b/tabs/post/core.lua
@@ -31,10 +31,6 @@ function m.CLOSE()
     m.frame:Hide()
 end
 
-function m.PICKUP_ITEM(item_info)
-	m.select_item(item_info.item_key)
-end
-
 function m.USE_ITEM(item_info)
 	m.select_item(item_info.item_key)
 end
@@ -362,7 +358,7 @@ function private.unit_vendor_price(item_key)
 
             if aux.info.auctionable(item_info.tooltip, nil, item_info.lootable) then
                 ClearCursor()
-                aux.orig.PickupContainerItem(unpack(slot))
+                PickupContainerItem(unpack(slot))
                 ClickAuctionSellItemButton()
                 local auction_sell_item = aux.info.auction_sell_item()
                 ClearCursor()
diff --git a/tabs/search/core.lua b/tabs/search/core.lua
index 9850f93..c61cbaf 100644
--- a/tabs/search/core.lua
+++ b/tabs/search/core.lua
@@ -156,11 +156,6 @@ function m.CLICK_LINK(item_info)
 	m.execute(nil, false)
 end
 
-function m.PICKUP_ITEM(item_info)
-	m.set_filter(strlower(item_info.name)..'/exact')
-	m.execute(nil, false)
-end
-
 function m.USE_ITEM(item_info)
 	m.set_filter(strlower(item_info.name)..'/exact')
 	m.execute(nil, false)