More cleanup of the context menus...