(RARCH_CONSOLE) Some cleanups