(XMB) Some cleanups