Remove some problematic menu-bar-mode logic