Unnecessary menu items removed from modal dialog (cleanup)