(RXUI) Cleanups