Commenting out un-used menus. Solves #1554