Revert "(RMenu) RMenu cleanups pt. 3"

This reverts commit bcc5f906b62005ab1d50b813a2eed0a73d2cb6d3.