Removed more obsolete menu code.