More cleanup, and disable menu items that do not yet work.