Really fix the uninstall problems