Some header cleanups.
Fix menubar generation.  Remove cruft and features we will not use.