Some menu and examples clean up.