Updated uninstall