Improved uninstall process