Remove dead code
Fix regression on menu validation

-validateMenuItem: takes precedence over -validateUserInterfaceItem:
and would make the latter useless. Fixed by merging the former into
-validateUserInterfaceItem:.