Updated uninstallation tools