Tidy up by extract XMPPAuction