(RMenu) RMenu cleanups pt. 2