Clean up menu-items, &c.