(XMB) Cleanups pt. 1