Menu fixes - better clean up when plugin uninstalled