(uninstaller) Refactor embedded uninstaller