diff --git a/Oqtane.Client/Services/Interfaces/IPageModuleService.cs b/Oqtane.Client/Services/Interfaces/IPageModuleService.cs
index d758508d..1879ea35 100644
--- a/Oqtane.Client/Services/Interfaces/IPageModuleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPageModuleService.cs
@@ -6,7 +6,6 @@ namespace Oqtane.Services
 {
     public interface IPageModuleService
     {
-        Task<List<PageModule>> GetPageModulesAsync();
         Task<PageModule> GetPageModuleAsync(int PageModuleId);
         Task<PageModule> GetPageModuleAsync(int PageId, int ModuleId);
         Task<PageModule> AddPageModuleAsync(PageModule PageModule);
diff --git a/Oqtane.Client/Services/Interfaces/IProfileService.cs b/Oqtane.Client/Services/Interfaces/IProfileService.cs
index e5f70bac..f26794a3 100644
--- a/Oqtane.Client/Services/Interfaces/IProfileService.cs
+++ b/Oqtane.Client/Services/Interfaces/IProfileService.cs
@@ -6,8 +6,6 @@ namespace Oqtane.Services
 {
     public interface IProfileService
     {
-        Task<List<Profile>> GetProfilesAsync();
-
         Task<List<Profile>> GetProfilesAsync(int SiteId);
 
         Task<Profile> GetProfileAsync(int ProfileId);
diff --git a/Oqtane.Client/Services/Interfaces/IRoleService.cs b/Oqtane.Client/Services/Interfaces/IRoleService.cs
index d7f26332..7b54c9d1 100644
--- a/Oqtane.Client/Services/Interfaces/IRoleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IRoleService.cs
@@ -6,8 +6,6 @@ namespace Oqtane.Services
 {
     public interface IRoleService
     {
-        Task<List<Role>> GetRolesAsync();
-
         Task<List<Role>> GetRolesAsync(int SiteId);
 
         Task<Role> GetRoleAsync(int RoleId);
diff --git a/Oqtane.Client/Services/Interfaces/ISiteService.cs b/Oqtane.Client/Services/Interfaces/ISiteService.cs
index e6fe3613..d852d32a 100644
--- a/Oqtane.Client/Services/Interfaces/ISiteService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISiteService.cs
@@ -7,7 +7,6 @@ namespace Oqtane.Services
     public interface ISiteService
     {
         Task<List<Site>> GetSitesAsync();
-        Task<List<Site>> GetSitesAsync(Alias Alias);
 
         Task<Site> GetSiteAsync(int SiteId);
         Task<Site> GetSiteAsync(int SiteId, Alias Alias);
diff --git a/Oqtane.Client/Services/Interfaces/IUserRoleService.cs b/Oqtane.Client/Services/Interfaces/IUserRoleService.cs
index f3bcfaa6..6fdfcebc 100644
--- a/Oqtane.Client/Services/Interfaces/IUserRoleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IUserRoleService.cs
@@ -6,7 +6,6 @@ namespace Oqtane.Services
 {
     public interface IUserRoleService
     {
-        Task<List<UserRole>> GetUserRolesAsync();
         Task<List<UserRole>> GetUserRolesAsync(int SiteId);
         Task<UserRole> GetUserRoleAsync(int UserRoleId);
         Task<UserRole> AddUserRoleAsync(UserRole UserRole);
diff --git a/Oqtane.Client/Services/Interfaces/IUserService.cs b/Oqtane.Client/Services/Interfaces/IUserService.cs
index e0ed49c9..820c2231 100644
--- a/Oqtane.Client/Services/Interfaces/IUserService.cs
+++ b/Oqtane.Client/Services/Interfaces/IUserService.cs
@@ -6,8 +6,6 @@ namespace Oqtane.Services
 {
     public interface IUserService
     {
-        Task<List<User>> GetUsersAsync();
-
         Task<User> GetUserAsync(int UserId, int SiteId);
 
         Task<User> GetUserAsync(string Username, int SiteId);
diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs
index 99ad9629..5095b060 100644
--- a/Oqtane.Client/Services/PageModuleService.cs
+++ b/Oqtane.Client/Services/PageModuleService.cs
@@ -26,11 +26,6 @@ namespace Oqtane.Services
             get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "PageModule"); }
         }
 
-        public async Task<List<PageModule>> GetPageModulesAsync()
-        {
-            return await http.GetJsonAsync<List<PageModule>>(apiurl);
-        }
-
         public async Task<PageModule> GetPageModuleAsync(int PageModuleId)
         {
             return await http.GetJsonAsync<PageModule>(apiurl + "/" + PageModuleId.ToString());
diff --git a/Oqtane.Client/Services/ProfileService.cs b/Oqtane.Client/Services/ProfileService.cs
index cffc2f52..7e187b03 100644
--- a/Oqtane.Client/Services/ProfileService.cs
+++ b/Oqtane.Client/Services/ProfileService.cs
@@ -26,11 +26,6 @@ namespace Oqtane.Services
             get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Profile"); }
         }
 
-        public async Task<List<Profile>> GetProfilesAsync()
-        {
-            return await http.GetJsonAsync<List<Profile>>(apiurl);
-        }
-
         public async Task<List<Profile>> GetProfilesAsync(int SiteId)
         {
             List<Profile> Profiles = await http.GetJsonAsync<List<Profile>>(apiurl + "?siteid=" + SiteId.ToString());
diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs
index 78720cd4..b56f2e80 100644
--- a/Oqtane.Client/Services/RoleService.cs
+++ b/Oqtane.Client/Services/RoleService.cs
@@ -26,12 +26,6 @@ namespace Oqtane.Services
             get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Role"); }
         }
 
-        public async Task<List<Role>> GetRolesAsync()
-        {
-            List<Role> Roles = await http.GetJsonAsync<List<Role>>(apiurl);
-            return Roles.OrderBy(item => item.Name).ToList();
-        }
-
         public async Task<List<Role>> GetRolesAsync(int SiteId)
         {
             List<Role> Roles = await http.GetJsonAsync<List<Role>>(apiurl + "?siteid=" + SiteId.ToString());
diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs
index 2041d207..432fc17e 100644
--- a/Oqtane.Client/Services/SiteService.cs
+++ b/Oqtane.Client/Services/SiteService.cs
@@ -31,11 +31,6 @@ namespace Oqtane.Services
             List<Site> sites = await http.GetJsonAsync<List<Site>>(apiurl);
             return sites.OrderBy(item => item.Name).ToList();
         }
-        public async Task<List<Site>> GetSitesAsync(Alias Alias)
-        {
-            List<Site> sites = await http.GetJsonAsync<List<Site>>(CreateApiUrl(Alias, NavigationManager.Uri, "Site"));
-            return sites.OrderBy(item => item.Name).ToList();
-        }
 
         public async Task<Site> GetSiteAsync(int SiteId)
         {
diff --git a/Oqtane.Client/Services/UserRoleService.cs b/Oqtane.Client/Services/UserRoleService.cs
index bd384ef2..6553f232 100644
--- a/Oqtane.Client/Services/UserRoleService.cs
+++ b/Oqtane.Client/Services/UserRoleService.cs
@@ -26,11 +26,6 @@ namespace Oqtane.Services
             get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "UserRole"); }
         }
 
-        public async Task<List<UserRole>> GetUserRolesAsync()
-        {
-            return await http.GetJsonAsync<List<UserRole>>(apiurl);
-        }
-
         public async Task<List<UserRole>> GetUserRolesAsync(int SiteId)
         {
             return await http.GetJsonAsync<List<UserRole>>(apiurl + "?siteid=" + SiteId.ToString());
diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs
index f52d75c6..aa6da0df 100644
--- a/Oqtane.Client/Services/UserService.cs
+++ b/Oqtane.Client/Services/UserService.cs
@@ -27,12 +27,6 @@ namespace Oqtane.Services
             get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "User"); }
         }
 
-        public async Task<List<User>> GetUsersAsync()
-        {
-            List<User> users = await http.GetJsonAsync<List<User>>(apiurl);
-            return users.OrderBy(item => item.DisplayName).ToList();
-        }
-
         public async Task<User> GetUserAsync(int UserId, int SiteId)
         {
             return await http.GetJsonAsync<User>(apiurl + "/" + UserId.ToString() + "?siteid=" + SiteId.ToString());
diff --git a/Oqtane.Client/Shared/Installer.razor b/Oqtane.Client/Shared/Installer.razor
index 477384f4..f999cdb2 100644
--- a/Oqtane.Client/Shared/Installer.razor
+++ b/Oqtane.Client/Shared/Installer.razor
@@ -59,7 +59,7 @@
                             <label for="Title" class="control-label" style="font-weight: bold">Username: </label>
                         </td>
                         <td>
-                            <input type="text" class="form-control" readonly @bind="@Username" />
+                            <input type="text" class="form-control" @bind="@Username" />
                         </td>
                     </tr>
                     <tr style="@IntegratedSecurityDisplay">
diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs
index 953d93b8..99ba628d 100644
--- a/Oqtane.Server/Controllers/PageModuleController.cs
+++ b/Oqtane.Server/Controllers/PageModuleController.cs
@@ -24,13 +24,6 @@ namespace Oqtane.Controllers
             this.logger = logger;
         }
 
-        // GET: api/<controller>
-        [HttpGet]
-        public IEnumerable<PageModule> Get()
-        {
-            return PageModules.GetPageModules();
-        }
-
         // GET api/<controller>/5
         [HttpGet("{id}")]
         public PageModule Get(int id)
diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs
index 6b256a0b..2e4e823c 100644
--- a/Oqtane.Server/Controllers/ProfileController.cs
+++ b/Oqtane.Server/Controllers/ProfileController.cs
@@ -24,14 +24,7 @@ namespace Oqtane.Controllers
         [HttpGet]
         public IEnumerable<Profile> Get(string siteid)
         {
-            if (siteid == "")
-            {
-                return Profiles.GetProfiles();
-            }
-            else
-            {
-                return Profiles.GetProfiles(int.Parse(siteid));
-            }
+            return Profiles.GetProfiles(int.Parse(siteid));
         }
 
         // GET api/<controller>/5
diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs
index c3bb6e45..c562a0f5 100644
--- a/Oqtane.Server/Controllers/RoleController.cs
+++ b/Oqtane.Server/Controllers/RoleController.cs
@@ -24,14 +24,7 @@ namespace Oqtane.Controllers
         [HttpGet]
         public IEnumerable<Role> Get(string siteid)
         {
-            if (siteid == "")
-            {
-                return Roles.GetRoles();
-            }
-            else
-            {
-                return Roles.GetRoles(int.Parse(siteid));
-            }
+            return Roles.GetRoles(int.Parse(siteid));
         }
 
         // GET api/<controller>/5
diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index fb720264..0660b5ff 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -42,14 +42,6 @@ namespace Oqtane.Controllers
             this.logger = logger;
         }
 
-        // GET: api/<controller>?siteid=x
-        [HttpGet]
-        [Authorize(Roles = Constants.AdminRole)]
-        public IEnumerable<User> Get()
-        {
-            return Users.GetUsers();
-        }
-
         // GET api/<controller>/5?siteid=x
         [HttpGet("{id}")]
         public User Get(int id, string siteid)
diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs
index 6d20321a..7601818e 100644
--- a/Oqtane.Server/Controllers/UserRoleController.cs
+++ b/Oqtane.Server/Controllers/UserRoleController.cs
@@ -24,14 +24,7 @@ namespace Oqtane.Controllers
         [HttpGet]
         public IEnumerable<UserRole> Get(string siteid)
         {
-            if (siteid == "")
-            {
-                return UserRoles.GetUserRoles();
-            }
-            else
-            {
-                return UserRoles.GetUserRoles(int.Parse(siteid));
-            }
+            return UserRoles.GetUserRoles(int.Parse(siteid));
         }
         
         // GET api/<controller>/5