(RMenu) More cleanups pt. 2