Uninstall scripts fixed