(XMB) Cleanups