diff --git a/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs b/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs
index 026a8b52f..dc244eeaf 100644
--- a/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs
+++ b/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs
@@ -400,19 +400,18 @@ private async Task ExtractDeviceInitInfo()
                     var codeSection = string.Join("", fileName.Skip(i).Take(codeLength));
 
                     if (codeSection.StartsWith("[") &&
-                        codeSection.EndsWith("]"))
+                        codeSection.EndsWith("]") && 
+                        !string.IsNullOrWhiteSpace(ServerUrl))
                     {
                         var relayCode = codeSection.Substring(1, 4);
                         using (var httpClient = new HttpClient())
                         {
-                            var response = await httpClient.GetAsync($"{AppConstants.DeviceInitUrl}/{relayCode}").ConfigureAwait(false);
+                            var response = await httpClient.GetAsync($"{ServerUrl}/api/relay/{relayCode}").ConfigureAwait(false);
                             if (response.IsSuccessStatusCode)
                             {
                                 var serializer = new JavaScriptSerializer();
-                                var contentString = await response.Content.ReadAsStringAsync();
-                                var deviceInitParams = serializer.Deserialize<DeviceInitParams>(contentString);
-                                OrganizationID = deviceInitParams.OrganizationId;
-                                ServerUrl = deviceInitParams.Host;
+                                var organizationId = await response.Content.ReadAsStringAsync();
+                                OrganizationID = organizationId;
                                 break;
                             }
                         }
diff --git a/Desktop.Core/Services/DeviceInitService.cs b/Desktop.Core/Services/DeviceInitService.cs
index eeca2cac2..5760e1947 100644
--- a/Desktop.Core/Services/DeviceInitService.cs
+++ b/Desktop.Core/Services/DeviceInitService.cs
@@ -50,20 +50,11 @@ public async Task GetInitParams()
 
                 var config = _configService.GetConfig();
 
-                if (!string.IsNullOrWhiteSpace(_conductor.Host) &&
-                    !string.IsNullOrWhiteSpace(_conductor.OrganizationId))
-                {
-                    config.Host = _conductor.Host;
-                    config.OrganizationId = _conductor.Host;
-                    _configService.Save(config);
-                    var brandingUrl = $"{_conductor.Host.TrimEnd('/')}/api/branding/{_conductor.OrganizationId}";
-                    _brandingInfo = await httpClient.GetFromJsonAsync<BrandingInfo>(brandingUrl).ConfigureAwait(false);
-                    return;
-                }
-
                 var fileName = Path.GetFileNameWithoutExtension(Process.GetCurrentProcess().MainModule.FileName);
                 
-                if (fileName.Contains("[") && fileName.Contains("]"))
+                if (fileName.Contains("[") && 
+                    fileName.Contains("]") && 
+                    !string.IsNullOrWhiteSpace(_conductor?.Host))
                 {
                     var codeLength = AppConstants.RelayCodeLength + 2;
 
@@ -74,13 +65,12 @@ public async Task GetInitParams()
                         {
                             var relayCode = codeSection[1..5];
 
-                            using var response = await httpClient.GetAsync($"{AppConstants.DeviceInitUrl}/{relayCode}").ConfigureAwait(false);
+                            using var response = await httpClient.GetAsync($"{_conductor.Host}/api/Relay/{relayCode}").ConfigureAwait(false);
                             if (response.IsSuccessStatusCode)
                             {
-                                var contentString = await response.Content.ReadAsStringAsync();
-                                var deviceInitParams = JsonSerializer.Deserialize<DeviceInitParams>(contentString, JsonSerializerHelper.CaseInsensitiveOptions);
-                                config.Host = deviceInitParams.Host;
-                                config.OrganizationId = deviceInitParams.OrganizationId;
+                                var organizationId = await response.Content.ReadAsStringAsync();
+                                config.Host = _conductor.Host;
+                                config.OrganizationId = organizationId;
                                 _configService.Save(config);
 
                                 var brandingUrl = $"{config.Host.TrimEnd('/')}/api/branding/{config.OrganizationId}";
@@ -89,8 +79,15 @@ public async Task GetInitParams()
                             }
                         }
                     }
-
-
+                }
+                
+                if (!string.IsNullOrWhiteSpace(_conductor?.Host))
+                {
+                    config.Host = _conductor.Host;
+                    config.OrganizationId = _conductor.OrganizationId;
+                    _configService.Save(config);
+                    var brandingUrl = $"{_conductor.Host.TrimEnd('/')}/api/branding/{_conductor.OrganizationId}";
+                    _brandingInfo = await httpClient.GetFromJsonAsync<BrandingInfo>(brandingUrl).ConfigureAwait(false);
                 }
             }
             catch (Exception ex)
diff --git a/Server/API/BrandingController.cs b/Server/API/BrandingController.cs
index 67684fcfa..bf573c8cb 100644
--- a/Server/API/BrandingController.cs
+++ b/Server/API/BrandingController.cs
@@ -24,13 +24,6 @@ public BrandingController(IDataService dataService)
         [HttpGet("{organizationId}")]
         public async Task<BrandingInfo> Get(string organizationId)
         {
-            var org = _dataService.GetOrganizationById(organizationId);
-            // We're doing the honor system here.
-            if (org.SponsorLevel < Shared.Enums.SponsorLevel.Branding)
-            {
-                return null;
-            }
-
             return await _dataService.GetBrandingInfo(organizationId);
         }
 
@@ -38,12 +31,7 @@ public async Task<BrandingInfo> Get(string organizationId)
         public async Task<BrandingInfo> GetDefault()
         {
             var defaultOrg = await _dataService.GetDefaultOrganization();
-            if (defaultOrg?.SponsorLevel >= Shared.Enums.SponsorLevel.Branding)
-            {
-                return await _dataService.GetBrandingInfo(defaultOrg.ID);
-            }
-
-            return null;
+            return await _dataService.GetBrandingInfo(defaultOrg.ID);
         }
     }
 }
diff --git a/Server/API/ClientDownloadsController.cs b/Server/API/ClientDownloadsController.cs
index ef7a685b6..d8204bd74 100644
--- a/Server/API/ClientDownloadsController.cs
+++ b/Server/API/ClientDownloadsController.cs
@@ -66,7 +66,7 @@ public async Task<IActionResult> GetDesktop(string platformID)
         }
 
         [HttpGet("clickonce-setup/{architecture}/{organizationId}")]
-        public async Task<IActionResult> GetClickOnceSetup(string architecture, string organizationId)
+        public IActionResult GetClickOnceSetup(string architecture, string organizationId)
         {
             string clickOnceDir;
 
@@ -83,39 +83,7 @@ public async Task<IActionResult> GetClickOnceSetup(string architecture, string o
             }
 
             var setupFilePath = Path.Combine(clickOnceDir, "setup.exe");
-            string appContent;
-
-            try
-            {
-                await ClickOnceMiddleware.AppFileLock.WaitAsync();
-                appContent = await System.IO.File.ReadAllTextAsync(Path.Combine(clickOnceDir, "Remotely_Desktop.application"));
-            }
-            finally
-            {
-                ClickOnceMiddleware.AppFileLock.Release();
-            }
-
-            if (appContent.Contains($"{Request.Scheme}://{Request.Host}"))
-            {
-                return File(new FileStream(setupFilePath, FileMode.Open, FileAccess.Read, FileShare.Read), "application/octet-stream", "setup.exe");
-            }
-
-            using var client = _httpClientFactory.CreateClient();
-            var formContent = new MultipartFormDataContent();
-            var bytes = await System.IO.File.ReadAllBytesAsync(setupFilePath);
-            using var byteContent = new ByteArrayContent(bytes);
-            formContent.Add(byteContent, "setup", "setup.exe");
-
-            try
-            {
-                using var response = await client.PostAsync($"{AppConstants.ClickOnceSetupUrl}/?host={Request.Scheme}://{Request.Host}&organizationid={organizationId}&architecture={architecture}", formContent);
-                var responseBytes = await response.Content.ReadAsByteArrayAsync();
-                return File(responseBytes, "application/octet-stream", "setup.exe");
-            }
-            catch
-            {
-                return NotFound();
-            }
+            return File(new FileStream(setupFilePath, FileMode.Open, FileAccess.Read, FileShare.Read), "application/octet-stream", "setup.exe");
         }
 
 
@@ -151,15 +119,12 @@ private async Task<IActionResult> GetBashInstaller(string fileName, string organ
 
         private async Task<IActionResult> GetDesktopFile(string filePath)
         {
-            var relayCode = string.Empty;
+            string relayCode;
 
             if (User.Identity.IsAuthenticated)
             {
                 var currentOrg = await _dataService.GetOrganizationByUserName(User.Identity.Name);
-                if (currentOrg.SponsorLevel >= Shared.Enums.SponsorLevel.Relay)
-                {
-                    relayCode = currentOrg.RelayCode;
-                }
+                relayCode = currentOrg.RelayCode;
             }
             else
             {
@@ -194,17 +159,8 @@ private async Task<IActionResult> GetInstallFile(string organizationId, string p
                                 var filePath = Path.Combine(_hostEnv.WebRootPath, "Downloads", "Remotely_Installer.exe");
                                 var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
                                 var organization = _dataService.GetOrganizationById(organizationId);
-
-                                if (organization.SponsorLevel > Shared.Enums.SponsorLevel.None)
-                                {
-                                    var relayCode = organization.RelayCode;
-                                    return File(fs, "application/octet-stream", $"Remotely_Install-[{relayCode}].exe");
-
-                                }
-                                else
-                                {
-                                    return File(fs, "application/octet-stream", $"Remotely_Installer-[{organizationId}].exe");
-                                }
+                                var relayCode = organization.RelayCode;
+                                return File(fs, "application/octet-stream", $"Remotely_Install-[{relayCode}].exe");
                             }
                         // TODO: Remove after a few releases.
                         case "Manjaro-x64":
diff --git a/Server/API/OrganizationManagementController.cs b/Server/API/OrganizationManagementController.cs
index 1d645ab0f..94b575b82 100644
--- a/Server/API/OrganizationManagementController.cs
+++ b/Server/API/OrganizationManagementController.cs
@@ -225,6 +225,22 @@ public IActionResult Name([FromBody] string organizationName)
             DataService.UpdateOrganizationName(orgID, organizationName.Trim());
             return Ok("ok");
         }
+
+        [HttpPut("SetDefault")]
+        [ServiceFilter(typeof(ApiAuthorizationFilter))]
+        public IActionResult SetDefault([FromBody] bool isDefault)
+        {
+            if (User.Identity.IsAuthenticated &&
+                !DataService.GetUserByName(User.Identity.Name).IsServerAdmin)
+            {
+                return Unauthorized();
+            }
+
+            Request.Headers.TryGetValue("OrganizationID", out var orgID);
+            DataService.SetIsDefaultOrganization(orgID, isDefault);
+            return Ok("ok");
+        }
+
         [HttpPost("SendInvite")]
         [ServiceFilter(typeof(ApiAuthorizationFilter))]
         public async Task<IActionResult> SendInvite([FromBody] Invite invite)
diff --git a/Server/API/RelayController.cs b/Server/API/RelayController.cs
new file mode 100644
index 000000000..d9833f57f
--- /dev/null
+++ b/Server/API/RelayController.cs
@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Remotely.Server.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Remotely.Server.API
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class RelayController : ControllerBase
+    {
+        private readonly IDataService _dataService;
+
+        public RelayController(IDataService dataService)
+        {
+            _dataService = dataService;
+        }
+
+        [HttpGet("{relayCode}")]
+        public async Task<string> Get(string relayCode)
+        {
+            var organization = await _dataService.GetOrganizationByRelayCode(relayCode);
+            return organization?.ID;
+        }
+    }
+}
diff --git a/Server/Areas/Identity/Pages/Account/Manage/Branding.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Branding.cshtml
index 910219566..09445dd08 100644
--- a/Server/Areas/Identity/Pages/Account/Manage/Branding.cshtml
+++ b/Server/Areas/Identity/Pages/Account/Manage/Branding.cshtml
@@ -11,12 +11,6 @@
 {
     <h5 class="text-muted">Only organization administrators can view this page.</h5>
 }
-@* We're doing the honor system here. *@
-else if (Model.Organization.SponsorLevel < Shared.Enums.SponsorLevel.Branding)
-{
-    <h5 class="text-muted">GitHub sponsorship level is not high enough to use branding.</h5>
-    <h3 class="text-muted">After sponsoring, you can register on the Organization tab.</h3>
-}
 else
 {
     <div class="row">
@@ -78,4 +72,4 @@ else
             </form>
         </div>
     </div>
-}
+}
\ No newline at end of file
diff --git a/Server/Areas/Identity/Pages/Account/Manage/Branding.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/Branding.cshtml.cs
index fe9b9a931..56a05fb5f 100644
--- a/Server/Areas/Identity/Pages/Account/Manage/Branding.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Manage/Branding.cshtml.cs
@@ -86,10 +86,6 @@ public async Task OnGet()
         public async Task<IActionResult> OnPostAsync()
         {
             CurrentUser = _dataService.GetUserByName(User.Identity.Name);
-            if (!CurrentUser.IsAdministrator || CurrentUser.Organization.SponsorLevel < Shared.Enums.SponsorLevel.Branding)
-            {
-                return Unauthorized();
-            }
 
             if (!ModelState.IsValid)
             {
diff --git a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml
index 84986acd7..d3d88f3a7 100644
--- a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml
+++ b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml
@@ -25,63 +25,10 @@
                 <label class="mb-1">Organization ID</label>
                 <input readonly class="form-control" value="@Model.Organization.ID" />
             </div>
-        </div>
-    </div>
-
-    @* GitHub Sponsors Registration *@
-    <div class="row">
-        <div class="col-sm-8">
-            <form method="post" asp-page-handler="RegisterSponsor" autocomplete="off">
-                <div class="form-group mw">
-                    <label class="mb-1">GitHub Sponsorship Level</label>
-                    <span id="sponsorMainHelp" class="fas fa-question-circle pointer"></span>
-                    @if (Model.Organization.SponsorLevel > Shared.Enums.SponsorLevel.None)
-                    {
-                        <div class="input-group">
-                            <input readonly class="form-control" value="@Model.Organization.SponsorLevel.ToString()" />
-                            <div class="input-group-append">
-                                <div class="fa fa-check-circle  input-group-text" style="color: limegreen"></div>
-                            </div>
-                        </div>
-                    }
-                    else
-                    {
-                        <div class="input-group">
-                            <input readonly class="form-control" value="@Model.Organization.SponsorLevel.ToString()" />
-                            <div class="input-group-append">
-                                <div class="fa fa-times-circle input-group-text" style="color: red"></div>
-                            </div>
-                        </div>
-                    }
-                </div>
-                <div class="form-group">
-                    <label class="mb-1">Sponsor Relay Code</label>
-                    <span id="sponsorRelayHelp" class="fas fa-question-circle pointer"></span>
-                    <input readonly class="form-control" value="@Model.Organization.RelayCode" />
-                </div>
-                <div class="form-group">
-                    <label class="mb-1">Sponsor Unlock Code (keep this safe and secret)</label>
-                    <span id="sponsorUnlockHelp" class="fas fa-question-circle pointer"></span>
-                    <input class="form-control" asp-for="UnlockCode" />
-                </div>
-                <div class="form-group">
-                    <label class="mb-1">Register GitHub Username</label>
-                    <input class="form-control" asp-for="GithubUsername" />
-                </div>
-                @if (Model.CurrentUser.IsServerAdmin)
-                {
-                    <div class="form-group">
-                        <label class="mb-1">Default Organization For Server</label>
-                        <span id="defaultOrgHelp" class="fas fa-question-circle pointer"></span>
-                        <br />
-                        <input type="checkbox" asp-for="IsDefaultOrganization" />
-                    </div>
-                }
-                <div class="form-group text-right">
-                    <button class="btn btn-secondary" type="submit" asp-page-handler="Disable">Disable</button>
-                    <button class="btn btn-primary" type="submit">Register</button>
-                </div>
-            </form>
+            <div class="form-group mw">
+                <label class="mb-1">Relay Code</label>
+                <input readonly class="form-control" value="@Model.Organization.RelayCode" />
+            </div>
         </div>
     </div>
 
@@ -99,6 +46,15 @@
                     </div>
                 </div>
             </div>
+            @if (Model.CurrentUser.IsServerAdmin)
+            {
+                <div class="form-group">
+                    <label class="mb-1">Default Organization For Server</label>
+                    <span id="defaultOrgHelp" class="fas fa-question-circle pointer"></span>
+                    <br />
+                    <input id="defaultOrgCheckbox" type="checkbox" asp-for="IsDefaultOrganization" />
+                </div>                
+            }
         </div>
     </div>
 
diff --git a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs
index b779bab04..4d9f24c27 100644
--- a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs
@@ -45,20 +45,6 @@ public OrganizationModel(
 
         public List<SelectListItem> DeviceGroupSelectItems { get; } = new List<SelectListItem>();
 
-        [BindProperty]
-        [Display(Name = "GitHub Username")]
-        [StringLength(40)]
-        [Required]
-        public string GithubUsername { get; set; }
-
-        [BindProperty]
-        [Display(Name = "Default Organization")]
-        public bool IsDefaultOrganization { get; set; }
-
-        [BindProperty]
-        [Display(Name = "Sponsor Unlock Code")]
-        [StringLength(24)]
-        public string UnlockCode { get; set; }
 
         [BindProperty]
         public InputModel Input { get; set; } = new InputModel();
@@ -67,6 +53,9 @@ public OrganizationModel(
         [Display(Name = "Invites")]
         public List<Invite> Invites { get; set; }
 
+        [Display(Name = "Default Organization")]
+        public bool IsDefaultOrganization { get; set; }
+
 
         [Display(Name = "Organization")]
         public Organization Organization { get; set; }
@@ -74,6 +63,7 @@ public OrganizationModel(
         [Display(Name = "Organization Name")]
         [StringLength(25)]
         public string OrganizationName { get; set; }
+
         [TempData]
         public string StatusMessage { get; set; }
 
@@ -124,64 +114,6 @@ public async Task<IActionResult> OnPostCreateDeviceGroupAsync()
             return RedirectToPage();
         }
 
-        public async Task<IActionResult> OnPostDisableAsync()
-        {
-            CurrentUser = await _userManager.FindByNameAsync(User.Identity.Name);
-
-            if (!CurrentUser.IsAdministrator)
-            {
-                return Unauthorized();
-            }
-            await _dataService.DisableSponsorship(CurrentUser.OrganizationID);
-            StatusMessage = "Sponsor features disabled successfully.";
-            return RedirectToPage();
-        }
-
-        public async Task<IActionResult> OnPostRegisterSponsorAsync()
-        {
-
-            CurrentUser = await _userManager.FindByNameAsync(User.Identity.Name);
-
-            if (!CurrentUser.IsAdministrator)
-            {
-                return Unauthorized();
-            }
-
-            using var client = _httpClientFactory.CreateClient();
-
-            Organization = await _dataService.GetOrganizationByUserName(User.Identity.Name);
-
-            var sponsorInfo = new SponsorInfo()
-            {
-                GithubUser = GithubUsername,
-                UnlockCode = UnlockCode,
-                HostName = $"{Request.Scheme}://{Request.Host}",
-                OrganizationId = Organization.ID,
-                Amount = Organization.SponsorAmount
-            };
-
-            var response = await client.PostAsync(AppConstants.SponsorRegistrationUrl, JsonContent.Create(sponsorInfo));
-            var responseText = await response.Content.ReadAsStringAsync();
-
-            if (response.IsSuccessStatusCode)
-            {
-                StatusMessage = "Successfully registered!  Please keep a backup copy of your unlock code in a safe place.";
-                sponsorInfo = JsonSerializer.Deserialize<SponsorInfo>(responseText, JsonSerializerHelper.CaseInsensitiveOptions);
-                var isDefaultOrg = IsDefaultOrganization && CurrentUser.IsServerAdmin;
-                await _dataService.UpdateOrganizationSponsorInfo(sponsorInfo, isDefaultOrg, true);
-            }
-            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
-            {
-                StatusMessage = $"Error: {responseText}";
-                await _dataService.UpdateOrganizationSponsorInfo(sponsorInfo, false, false);
-            }
-            else
-            {
-                StatusMessage = "There was a problem registering.  Please try again or contact support.";
-            }
-
-            return RedirectToPage();
-        }
 
         internal async Task<IActionResult> AddUser(RemotelyUser currentUser)
         {
@@ -249,8 +181,6 @@ private async Task PopulateViewModel()
             CurrentUser = await _userManager.FindByEmailAsync(User.Identity.Name);
             Organization = _dataService.GetOrganizationById(CurrentUser.OrganizationID);
             OrganizationName = Organization.OrganizationName;
-            GithubUsername = Organization.GithubUser;
-            UnlockCode = Organization.UnlockCode;
             IsDefaultOrganization = Organization.IsDefaultOrganization;
             var deviceGroups = _dataService.GetDeviceGroups(User.Identity.Name).OrderBy(x => x.Name);
             DeviceGroups.AddRange(deviceGroups);
diff --git a/Server/Areas/Identity/Pages/Account/Register.cshtml.cs b/Server/Areas/Identity/Pages/Account/Register.cshtml.cs
index 8c5318dbe..67e5ec868 100644
--- a/Server/Areas/Identity/Pages/Account/Register.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Register.cshtml.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Logging;
 using Remotely.Server.Services;
 using Remotely.Shared.Models;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -84,6 +85,7 @@ public async Task<IActionResult> OnPostAsync(string returnUrl = null)
             }
             returnUrl ??= Url.Content("~/");
             ExternalLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync()).ToList();
+
             if (ModelState.IsValid)
             {
                 var user = new RemotelyUser
@@ -95,6 +97,13 @@ public async Task<IActionResult> OnPostAsync(string returnUrl = null)
                     UserOptions = new RemotelyUserOptions(),
                     IsAdministrator = true
                 };
+
+                do
+                {
+                    user.Organization.RelayCode = new string(Guid.NewGuid().ToString().Take(4).ToArray());
+                }
+                while (await _dataService.GetOrganizationByRelayCode(user.Organization.RelayCode) != null);
+
                 var result = await _userManager.CreateAsync(user, Input.Password);
 
                 if (result.Succeeded)
diff --git a/Server/Pages/Agents.cshtml b/Server/Pages/Agents.cshtml
index 15523dae1..54de3e591 100644
--- a/Server/Pages/Agents.cshtml
+++ b/Server/Pages/Agents.cshtml
@@ -8,7 +8,7 @@
 {
     <div class="small mb-3">
         <span class="fas fa-question-circle pointer"></span>
-        You are signed in.  All links will be specific to your organization and, if applicable, will be branded.
+        You are signed in.  Instant support links will be specific to your organization and, if applicable, will be branded.
         You can share these links directly with customers for download.
     </div>
 }
@@ -59,13 +59,6 @@
         </div>
 
     }
-    @* We're doing the honor system here. *@
-    else if (Model.CurrentOrganization.SponsorLevel < Remotely.Shared.Enums.SponsorLevel.Branding)
-    {
-        <div class="col-sm-6 mb-3">
-            <h6>Sponsor level is not high enough for installable clients.</h6>
-        </div>
-    }
     else
     {
         <div class="col-sm-6 mb-3">
diff --git a/Server/Pages/Index.cshtml b/Server/Pages/Index.cshtml
index 6bb9dd856..511f55877 100644
--- a/Server/Pages/Index.cshtml
+++ b/Server/Pages/Index.cshtml
@@ -23,9 +23,9 @@ else
         <div class="alert alert-info alert-dismissible mr-5" role="alert">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
             <span class="mr-1">A new version is available!  Upgrade scripts:</span>
-            <a class="mr-1" href="@AppConstants.UbuntuUpgradeUrl">Ubuntu</a>
-            <a class="mr-1" href="@AppConstants.WindowsUpgradeUrl">Windows</a>
-            <a class="mr-1" href="@AppConstants.CentOsUpgradeUrl">CentOS</a>
+            <a class="mr-1" href="~/Downloads/Ubuntu-Upgrade.sh">Ubuntu</a>
+            <a class="mr-1" href="~/Downloads/Windows-Upgrade.ps1">Windows</a>
+            <a class="mr-1" href="~/Downloads/CentOS-Upgrade.sh">CentOS</a>
         </div>
     }
 
diff --git a/Server/Pages/Index.cshtml.cs b/Server/Pages/Index.cshtml.cs
index 72927ff89..6f15ae008 100644
--- a/Server/Pages/Index.cshtml.cs
+++ b/Server/Pages/Index.cshtml.cs
@@ -60,10 +60,7 @@ public async Task<IActionResult> OnGet()
                 RegistrationAvailable = _appConfig.MaxOrganizationCount < 0 || organizationCount < _appConfig.MaxOrganizationCount;
 
                 var org = _dataService.GetOrganizationById(user.OrganizationID);
-                if (user.IsServerAdmin && org.SponsorLevel > SponsorLevel.None)
-                {
-                    IsNewVersionAvailable = await _upgradeService.IsNewVersionAvailable();
-                }
+                IsNewVersionAvailable = await _upgradeService.IsNewVersionAvailable();
 
                 DefaultPrompt = _dataService.GetDefaultPrompt(User.Identity.Name);
                 var groups = _dataService.GetDeviceGroups(User.Identity.Name);
diff --git a/Server/Pages/Shared/_Layout.cshtml b/Server/Pages/Shared/_Layout.cshtml
index e68507016..da30d98dd 100644
--- a/Server/Pages/Shared/_Layout.cshtml
+++ b/Server/Pages/Shared/_Layout.cshtml
@@ -115,6 +115,11 @@
     <div class="container">
         <main role="main">
             @RenderBody()
+
+
+            <div id="toastsWrapper">
+
+            </div>
         </main>
     </div>
     <footer class="footer text-muted">
diff --git a/Server/Pages/_IndexLoggedIn.cshtml b/Server/Pages/_IndexLoggedIn.cshtml
index 150c8ae55..849df1977 100644
--- a/Server/Pages/_IndexLoggedIn.cshtml
+++ b/Server/Pages/_IndexLoggedIn.cshtml
@@ -67,9 +67,6 @@
 </div>
 
 
-<div id="toastsWrapper">
-
-</div>
 
 
 
diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index a7ab79c88..488c14fba 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Primitives;
 using Remotely.Server.Areas.Identity.Pages.Account.Manage;
 using Remotely.Server.Data;
 using Remotely.Shared.Enums;
@@ -25,12 +26,17 @@ public interface IDataService
         void AddOrUpdateCommandResult(CommandResult commandResult);
         bool AddOrUpdateDevice(Device device, out Device updatedDevice);
         Task<string> AddSharedFile(IFormFile file, string organizationID);
+
         bool AddUserToDeviceGroup(string orgID, string groupID, string userName, out string resultMessage);
+
         void ChangeUserIsAdmin(string organizationID, string targetUserID, bool isAdmin);
+
         void CleanupOldRecords();
+
         Task ClearLogs(string currentUserName);
 
         Task<ApiToken> CreateApiToken(string userName, string tokenName, string secretHash);
+
         Task<Device> CreateDevice(DeviceSetupOptions options);
 
         Task<bool> CreateUser(string userEmail, bool isAdmin, string organizationID);
@@ -47,8 +53,6 @@ public interface IDataService
 
         void DeviceDisconnected(string deviceID);
 
-        Task DisableSponsorship(string organizationId);
-
         bool DoesUserExist(string userName);
 
         bool DoesUserHaveAccessToDevice(string deviceID, RemotelyUser remotelyUser);
@@ -84,12 +88,11 @@ public interface IDataService
         CommandResult GetCommandResult(string commandResultID, string orgID);
 
         Task<Organization> GetDefaultOrganization();
+
         string GetDefaultPrompt();
 
         string GetDefaultPrompt(string userName);
 
-        Task<string> GetDefaultRelayCode();
-
         Device GetDevice(string deviceID);
 
         Device GetDevice(string orgID, string deviceID);
@@ -104,6 +107,7 @@ public interface IDataService
 
         Organization GetOrganizationById(string organizationID);
 
+        Task<Organization> GetOrganizationByRelayCode(string relayCode);
         Task<Organization> GetOrganizationByUserName(string userName);
 
         int GetOrganizationCount();
@@ -138,6 +142,8 @@ public interface IDataService
 
         Task SetDisplayName(RemotelyUser user, string displayName);
 
+        Task SetIsDefaultOrganization(string orgID, bool isDefault);
+
         void SetServerVerificationToken(string deviceID, string verificationToken);
 
         Task<bool> TempPasswordSignIn(string email, string password);
@@ -149,11 +155,10 @@ Task UpdateBrandingInfo(
             ColorPickerModel titleForeground, 
             ColorPickerModel titleBackground, 
             ColorPickerModel titleButtonForeground);
+        Task<string> GetDefaultRelayCode();
         Task<Device> UpdateDevice(DeviceSetupOptions deviceOptions, string organizationId);
         void UpdateDevice(string deviceID, string tag, string alias, string deviceGroupID, string notes, WebRtcSetting webRtcSetting);
         void UpdateOrganizationName(string orgID, string organizationName);
-
-        Task UpdateOrganizationSponsorInfo(SponsorInfo sponsorInfo, bool isDefaultOrganization, bool updateUnlockCode);
         Task UpdateServerAdmins(List<string> serverAdmins, string callerUserName);
         void UpdateTags(string deviceID, string tags);
         void UpdateUserOptions(string userName, RemotelyUserOptions options);
@@ -638,21 +643,6 @@ public void DeviceDisconnected(string deviceID)
             }
         }
 
-        public async Task DisableSponsorship(string organizationId)
-        {
-            if (string.IsNullOrWhiteSpace(organizationId))
-            {
-                return;
-            };
-
-            var organization = await _dbContext.Organizations.FindAsync(organizationId);
-            if (organization != null)
-            {
-                organization.SponsorAmount = 0;
-                organization.RelayCode = null;
-                await _dbContext.SaveChangesAsync();
-            }
-        }
 
         public bool DoesUserExist(string userName)
         {
@@ -845,7 +835,7 @@ public string GetDefaultPrompt()
         public async Task<string> GetDefaultRelayCode()
         {
             var relayCode = await _dbContext.Organizations
-                .Where(x => x.IsDefaultOrganization && x.SponsorAmount >= 10)
+                .Where(x => x.IsDefaultOrganization)
                 .Select(x => x.RelayCode)
                 .FirstOrDefaultAsync();
 
@@ -947,6 +937,16 @@ public Organization GetOrganizationById(string organizationID)
             return _dbContext.Organizations.Find(organizationID);
         }
 
+        public async Task<Organization> GetOrganizationByRelayCode(string relayCode)
+        {
+            if (string.IsNullOrWhiteSpace(relayCode))
+            {
+                return null;
+            }
+
+            return await _dbContext.Organizations.FirstOrDefaultAsync(x => x.RelayCode == relayCode.ToLower());
+        }
+
         public async Task<Organization> GetOrganizationByUserName(string userName)
         {
             var user = await _dbContext
@@ -1153,6 +1153,23 @@ public async Task SetDisplayName(RemotelyUser user, string displayName)
             await _dbContext.SaveChangesAsync();
         }
 
+        public async Task SetIsDefaultOrganization(string orgID, bool isDefault)
+        {
+            var organization = await _dbContext.Organizations.FindAsync(orgID);
+            if (organization is null)
+            {
+                return;
+            }
+
+            if (isDefault)
+            {
+                await _dbContext.Organizations.ForEachAsync(x => x.IsDefaultOrganization = false);
+            }
+
+            organization.IsDefaultOrganization = isDefault;
+            await _dbContext.SaveChangesAsync();
+        }
+
         public void SetServerVerificationToken(string deviceID, string verificationToken)
         {
             var device = _dbContext.Devices.Find(deviceID);
@@ -1274,32 +1291,6 @@ public void UpdateOrganizationName(string orgID, string organizationName)
             _dbContext.SaveChanges();
         }
 
-        public async Task UpdateOrganizationSponsorInfo(SponsorInfo sponsorInfo, bool isDefaultOrganization, bool updateUnlockCode)
-        {
-            var organization = await _dbContext.Organizations.FindAsync(sponsorInfo.OrganizationId);
-            if (organization is null)
-            {
-                return;
-            }
-
-            if (updateUnlockCode)
-            {
-                // Don't wipe this out due to a failure response.
-                organization.UnlockCode = sponsorInfo.UnlockCode;
-            }
-
-            if (isDefaultOrganization)
-            {
-                await _dbContext.Organizations.ForEachAsync(x => x.IsDefaultOrganization = false);
-            }
-
-            organization.SponsorAmount = sponsorInfo.Amount;
-            organization.RelayCode = sponsorInfo.RelayCode;
-            organization.GithubUser = sponsorInfo.GithubUser;
-            organization.IsDefaultOrganization = isDefaultOrganization;
-
-            await _dbContext.SaveChangesAsync();
-        }
 
         public async Task UpdateServerAdmins(List<string> serverAdmins, string callerUserName)
         {
diff --git a/Server/wwwroot/Downloads/CentOS-Upgrade.sh b/Server/wwwroot/Downloads/CentOS-Upgrade.sh
new file mode 100644
index 000000000..b682c1ffd
--- /dev/null
+++ b/Server/wwwroot/Downloads/CentOS-Upgrade.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+AppRoot=$(cat /etc/systemd/system/remotely.service | grep -i "execstart" | cut -d' ' -f 2)
+
+echo "Remotely server upgrade started."
+
+echo "Target path: $AppRoot"
+
+read -p "If this is not correct, press Ctrl + C now to abort!"
+
+
+echo "Ensuring dependencies are installed."
+
+ # Install other prerequisites.
+yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+yum -y install yum-utils
+yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional
+yum -y install unzip
+yum -y install acl
+
+
+echo "Downloading latest Remotely package."
+# Download and install Remotely files.
+mkdir -p $AppRoot
+wget "https://github.com/lucent-sea/Remotely/releases/latest/download/Remotely_Server_Linux-x64.zip"
+unzip -o Remotely_Server_Linux-x64.zip -d $AppRoot
+rm Remotely_Server_Linux-x64.zip
+setfacl -R -m u:www-data:rwx $AppRoot
+chown -R "$USER":www-data $AppRoot
+
+# Restart service.
+systemctl restart remotely.service
+
+echo "Update complete."
\ No newline at end of file
diff --git a/Server/wwwroot/Downloads/Ubuntu-Upgrade.sh b/Server/wwwroot/Downloads/Ubuntu-Upgrade.sh
new file mode 100644
index 000000000..7eca9c9bd
--- /dev/null
+++ b/Server/wwwroot/Downloads/Ubuntu-Upgrade.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+AppRoot=$(cat /etc/systemd/system/remotely.service | grep -i "execstart" | cut -d' ' -f 2)
+
+echo "Remotely server upgrade started."
+
+echo "Target path: $AppRoot"
+
+read -p "If this is not correct, press Ctrl + C now to abort!"
+
+
+echo "Ensuring dependencies are installed."
+
+ # Install other prerequisites.
+apt-get -y install unzip
+apt-get -y install acl
+
+
+echo "Downloading latest Remotely package."
+# Download and install Remotely files.
+mkdir -p $AppRoot
+wget "https://github.com/lucent-sea/Remotely/releases/latest/download/Remotely_Server_Linux-x64.zip"
+unzip -o Remotely_Server_Linux-x64.zip -d $AppRoot
+rm Remotely_Server_Linux-x64.zip
+setfacl -R -m u:www-data:rwx $AppRoot
+chown -R "$USER":www-data $AppRoot
+
+# Restart service.
+systemctl restart remotely.service
+
+echo "Update complete."
\ No newline at end of file
diff --git a/Server/wwwroot/Downloads/Windows-Upgrade.ps1 b/Server/wwwroot/Downloads/Windows-Upgrade.ps1
new file mode 100644
index 000000000..bebd385b3
--- /dev/null
+++ b/Server/wwwroot/Downloads/Windows-Upgrade.ps1
@@ -0,0 +1,143 @@
+#region Functions
+function Do-Pause {
+    if (!$Quiet){
+        pause
+    }
+}
+function Wrap-Host
+{
+    [CmdletBinding()]
+    [Alias()]
+    [OutputType([int])]
+    Param
+    (
+        # The text to write.
+        [Parameter(Mandatory=$false,
+                   ValueFromPipelineByPropertyName=$true,
+                   Position=0)]
+        [String]
+        $Text,
+
+        # Param2 help description
+        [Parameter(Mandatory=$false,
+                   ValueFromPipelineByPropertyName=$true,
+                   Position=1)]
+        [ConsoleColor]
+        $ForegroundColor
+    )
+
+    Begin
+    {
+    }
+    Process
+    {
+        if (!$Text){
+            Write-Host
+            return
+        }
+        $Width = $Host.UI.RawUI.BufferSize.Width
+        $SB = New-Object System.Text.StringBuilder
+        while ($Text.Length -gt $Width) {
+            [int]$LastSpace = $Text.Substring(0, $Width).LastIndexOf(" ")
+            $SB.AppendLine($Text.Substring(0, $LastSpace).Trim()) | Out-Null
+            $Text = $Text.Substring(($LastSpace), $Text.Length - $LastSpace).Trim()
+        }
+        $SB.Append($Text) | Out-Null
+        if ($ForegroundColor)
+        {
+            Write-Host $SB.ToString() -ForegroundColor $ForegroundColor
+        }
+        else
+        {
+            Write-Host $SB.ToString()
+        }
+        
+    }
+    End
+    {
+    }
+}
+
+#endregion
+
+ 
+### Site Selection ###
+Wrap-Host
+Get-Website
+Wrap-Host
+Wrap-Host "Enter the ID of the website where Remotely is installed." -ForegroundColor Green
+Wrap-Host
+$ID = Read-Host "Website ID"
+
+$Website = Get-Website | Where-Object {$_.ID -like $ID}
+$SiteName = $Website.name
+
+
+# Stop site.
+Clear-Host
+Wrap-Host
+Wrap-Host "Stopping website..." -ForegroundColor Green
+Stop-Website -Name $SiteName
+
+
+### File Cleanup ###
+Wrap-Host
+Wrap-Host "Cleaning up existing files..." -ForegroundColor Green
+$Success = $false
+
+while ($Success -eq $false) {
+    try {
+        Get-ChildItem -Path "$SitePath" -Recurse | Where-Object {
+            $_.Extension -inotlike ".db" -and $_.Name -inotlike "*appsettings*"
+        } | Remove-Item -Force
+        $Success = $true
+    }
+    catch {
+        Start-Sleep -Seconds 1
+    }
+}
+
+
+
+### Download Server Package ###
+try {
+    if ((Test-Path -Path "$env:TEMP\Remotely_Server_Win-x64.zip")){
+        Remove-Item -Path "$env:TEMP\Remotely_Server_Win-x64.zip" -Force
+    }
+    Wrap-Host "Downloading server package..."
+	$ProgressPreference = "SilentlyContinue"
+    Invoke-WebRequest -Uri "https://github.com/lucent-sea/Remotely/releases/latest/download/Remotely_Server_Win-x64.zip" -OutFile "$env:TEMP\Remotely_Server_Win-x64.zip"
+    $ProgressPreference = "Continue"
+    Wrap-Host "Extracting server files..."
+	[System.Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") | Out-Null
+	[System.IO.Compression.ZipFile]::ExtractToDirectory("$env:TEMP\Remotely_Server_Win-x64.zip", $SitePath)
+}
+catch {
+    Wrap-Host
+    Wrap-Host "Error: Unable to download or extract client files." -ForegroundColor Red
+    Do-Pause
+    return
+}
+
+### Set ACL on website folders and files ###
+Wrap-Host
+Wrap-Host "Setting ACLs..." -ForegroundColor Green
+$Acl = Get-Acl -Path $SitePath
+$Rule = New-Object System.Security.AccessControl.FileSystemAccessRule("BUILTIN\IIS_IUSRS", "Modify", "ContainerInherit,ObjectInherit", "None", "Allow")
+$Acl.AddAccessRule($Rule)
+$Acl.SetOwner((New-Object System.Security.Principal.NTAccount("Administrators")))
+Set-Acl -Path $SitePath -AclObject $Acl
+Get-ChildItem -Path $SitePath -Recurse | ForEach-Object {
+    Set-Acl -Path $_.FullName -AclObject $Acl   
+}
+
+
+# Start website.
+Start-Website -Name $SiteName
+
+Wrap-Host
+Wrap-Host
+Wrap-Host "**********************************"
+Wrap-Host "      Server upgrade complete!" -ForegroundColor Green
+Wrap-Host "**********************************"
+Wrap-Host
\ No newline at end of file
diff --git a/Server/wwwroot/src/Pages/OrganizationManagement.ts b/Server/wwwroot/src/Pages/OrganizationManagement.ts
index a27c57699..b9c4442da 100644
--- a/Server/wwwroot/src/Pages/OrganizationManagement.ts
+++ b/Server/wwwroot/src/Pages/OrganizationManagement.ts
@@ -1,4 +1,4 @@
-import { ShowModal } from "../Shared/UI.js";
+import { ShowMessage, ShowModal } from "../Shared/UI.js";
 
 export const OrganizationManagement = {
     Init() {
@@ -20,56 +20,12 @@ export const OrganizationManagement = {
             ShowModal("Device Groups", `Device groups can be used to organize and filter computers on the grid.`);
         });
 
-        document.getElementById("sponsorMainHelp").addEventListener("click", () => {
-            ShowModal("GitHub Sponsors", `Additional features can be unlocked by sponsoring $10 or more 
-                on <a href="https://github.com/sponsors/lucent-sea">GitHub Sponsors</a>. After setting up
-                your sponsorship, enter your GitHub username below to register your server.<br/><br/>
-                <strong>Sponsorship Levels:</strong><br/><br/>
-                Relay ($10):
-                <ul>
-                    <li>
-                        No need to compile from source to embed your server's URL into the EXEs.  A
-                        short "relay code" will be appended to the file names, which the apps will
-                        use to get your server URL and organization ID from a hosted web service.
-                    </li>
-                    <li>
-                        Notifications when new server versions are available.
-                    </li>
-                    <li>
-                        Easy server upgrades via custom script.
-                    </li>
-                </ul>
-                Branding ($20):
-                <ul>
-                    <li>
-                        All of the above features.
-                    </li>
-                    <li>
-                        Apply branding to desktop apps without needing to recompile.
-                    </li>
-                    <li>
-                        Access to a light-weight, self-updating, installable version of the quick support client.
-                    </li>
-                </ul>`);
-        });
-
-        document.getElementById("sponsorUnlockHelp").addEventListener("click", () => {
-            ShowModal("Unlock Code", `After your server is first registered, this unlock code must be sent 
-                with all future requests that make changes to your registration status.  This is to prevent
-                others from using your GitHub username to register a different server.`);
-        });
-
-        document.getElementById("sponsorRelayHelp").addEventListener("click", () => {
-            ShowModal("Relay Code", `This relay code will be appended to EXE filenames.  The apps will
-                use it to look up your server and organization info via the central registration API,
-                which removes the need to recompile the apps to embed the info.`);
-        });
 
         document.getElementById("defaultOrgHelp").addEventListener("click", () => {
             ShowModal("Default Organization", `This option is only available for server administrators.  When
                 selected during registration, it sets this organization as the default for the server.  The
                 quick support downloads, which aren't normally associated with an organization, will use
-                this organization's relay code and branding.`);
+                this organization's branding.`);
         });
 
 
@@ -227,6 +183,27 @@ export const OrganizationManagement = {
             xhr.send(JSON.stringify((ev.currentTarget as HTMLInputElement).value));
         });
 
+        document.getElementById("defaultOrgCheckbox").addEventListener("change", (ev) => {
+            var xhr = new XMLHttpRequest();
+            xhr.onload = () => {
+                if (xhr.status == 200) {
+                    ShowMessage("Default organization set.");
+                }
+                else if (xhr.status == 400) {
+                    ShowModal("Invalid Request", xhr.responseText);
+                }
+                else {
+                    showError(xhr);
+                }
+            }
+            xhr.onerror = () => {
+                showError(xhr);
+            }
+            xhr.open("put", location.origin + "/api/OrganizationManagement/SetDefault");
+            xhr.setRequestHeader("Content-Type", "application/json");
+            xhr.send(JSON.stringify((ev.currentTarget as HTMLInputElement).checked));
+        });
+
 
         document.querySelectorAll(".user-is-admin-checkbox").forEach((checkbox: HTMLInputElement) => {
             checkbox.addEventListener("change", (ev) => {
diff --git a/Shared/Models/Organization.cs b/Shared/Models/Organization.cs
index 4a95e6d45..e5a698a77 100644
--- a/Shared/Models/Organization.cs
+++ b/Shared/Models/Organization.cs
@@ -32,32 +32,12 @@ public class Organization
 
         public bool IsDefaultOrganization { get; set; }
 
-        public double SponsorAmount { get; set; }
-
-        [NotMapped]
-        public SponsorLevel SponsorLevel
-        {
-            get
-            {
-                if (SponsorAmount < 10)
-                {
-                    return SponsorLevel.None;
-                }
-                if (SponsorAmount < 20)
-                {
-                    return SponsorLevel.Relay;
-                }
-
-                return SponsorLevel.Branding;
-            }
-        }
-
         [StringLength(25)]
         public string OrganizationName { get; set; }
 
         public string RelayCode { get; set; }
+
         public ICollection<RemotelyUser> RemotelyUsers { get; set; }
         public ICollection<SharedFile> SharedFiles { get; set; }
-        public string UnlockCode { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Shared/Utilities/AppConstants.cs b/Shared/Utilities/AppConstants.cs
index 156bda50f..1cd62fffe 100644
--- a/Shared/Utilities/AppConstants.cs
+++ b/Shared/Utilities/AppConstants.cs
@@ -8,26 +8,8 @@ namespace Remotely.Shared.Utilities
 {
     public class AppConstants
     {
-        public const string CentOsUpgradeUrl = "https://api.remotely.one/api/upgrade/centos";
-
-        public static string ClickOnceSetupUrl
-        {
-            get
-            {
-#if DEBUG
-                return "http://localhost:7071/api/UpdateSetup";
-#else
-                return  "https://remotely-clickonce.azurewebsites.net/api/UpdateSetup";
-#endif
-            }
-        }
-
         public const string DefaultProductName = "Remotely";
         public const string DefaultPublisherName = "Translucency Software";
-        public const string DeviceInitUrl = "https://remotely-api.azurewebsites.net/api/sponsors/info";
         public const int RelayCodeLength = 4;
-        public const string SponsorRegistrationUrl = "https://remotely-api.azurewebsites.net/api/sponsors/register";
-        public const string UbuntuUpgradeUrl = "https://remotely-api.azurewebsites.net/api/upgrade/ubuntu";
-        public const string WindowsUpgradeUrl = "https://remotely-api.azurewebsites.net/api/upgrade/windows";
     }
 }