More progress on uninstallation