Removed Pickup validation hack