Tweak uninstall process.#184