Menu/toolbar refactoring: Remove obsolete code.