(RGUI) Cleanups