diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs
index 236387823c..b382655d8b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs
@@ -83,62 +83,6 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             return tenantConfiguration;
         }
 
-        public TenantConfiguration Find(string name)
-        {
-            var cacheKey = CreateCacheKey(name);
-            var httpContext = HttpContextAccessor?.HttpContext;
-
-            if (httpContext != null && httpContext.Items[cacheKey] is TenantConfiguration tenantConfiguration)
-            {
-                return tenantConfiguration;
-            }
-
-            tenantConfiguration = Cache.GetOrAdd(
-                cacheKey,
-                () => AsyncHelper.RunSync(async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByNameAsync(name))),
-                () => new DistributedCacheEntryOptions
-                {
-                    AbsoluteExpirationRelativeToNow =
-                        TimeSpan.FromMinutes(5) //TODO: Should be configurable.
-                }
-            );
-
-            if (httpContext != null)
-            {
-                httpContext.Items[cacheKey] = tenantConfiguration;
-            }
-
-            return tenantConfiguration;
-        }
-
-        public TenantConfiguration Find(Guid id)
-        {
-            var cacheKey = CreateCacheKey(id);
-            var httpContext = HttpContextAccessor?.HttpContext;
-
-            if (httpContext != null && httpContext.Items[cacheKey] is TenantConfiguration tenantConfiguration)
-            {
-                return tenantConfiguration;
-            }
-            
-            tenantConfiguration = Cache.GetOrAdd(
-                cacheKey,
-                () => AsyncHelper.RunSync(async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByIdAsync(id))),
-                () => new DistributedCacheEntryOptions
-                {
-                    AbsoluteExpirationRelativeToNow =
-                        TimeSpan.FromMinutes(5) //TODO: Should be configurable.
-                }
-            );
-
-            if (httpContext != null)
-            {
-                httpContext.Items[cacheKey] = tenantConfiguration;
-            }
-
-            return tenantConfiguration;
-        }
-
         protected virtual TenantConfiguration CreateTenantConfiguration(FindTenantResultDto tenantResultDto)
         {
             if (!tenantResultDto.Success || tenantResultDto.TenantId == null)
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantStore.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantStore.cs
index 7125a97405..b1c8f97f1a 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantStore.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantStore.cs
@@ -8,9 +8,5 @@ namespace Volo.Abp.MultiTenancy
         Task<TenantConfiguration> FindAsync(string name);
 
         Task<TenantConfiguration> FindAsync(Guid id);
-
-        TenantConfiguration Find(string name);
-
-        TenantConfiguration Find(Guid id);
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
index d92409fe0d..fcae880970 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Threading;
 
 namespace Volo.Abp.MultiTenancy
 {
@@ -37,7 +38,7 @@ namespace Volo.Abp.MultiTenancy
                     .ServiceProvider
                     .GetRequiredService<ITenantStore>();
 
-                var tenant = tenantStore.Find(_currentTenant.Id.Value);
+                var tenant = AsyncHelper.RunSync(() => tenantStore.FindAsync(_currentTenant.Id.Value));
 
                 if (tenant?.ConnectionStrings == null)
                 {
diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobStore.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobStore.cs
index db6f5cc486..b8d30b6940 100644
--- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobStore.cs
+++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobStore.cs
@@ -34,13 +34,6 @@ namespace Volo.Abp.BackgroundJobs
             );
         }
 
-        public List<BackgroundJobInfo> GetWaitingJobs(int maxResultCount)
-        {
-            return ObjectMapper.Map<List<BackgroundJobRecord>, List<BackgroundJobInfo>>(
-                BackgroundJobRepository.GetWaitingList(maxResultCount)
-            );
-        }
-
         public virtual async Task<List<BackgroundJobInfo>> GetWaitingJobsAsync(int maxResultCount)
         {
             return ObjectMapper.Map<List<BackgroundJobRecord>, List<BackgroundJobInfo>>(
diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/IBackgroundJobRepository.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/IBackgroundJobRepository.cs
index a34cbd6abb..e12aeff70a 100644
--- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/IBackgroundJobRepository.cs
+++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/IBackgroundJobRepository.cs
@@ -7,8 +7,6 @@ namespace Volo.Abp.BackgroundJobs
 {
     public interface IBackgroundJobRepository : IBasicRepository<BackgroundJobRecord, Guid>
     {
-        List<BackgroundJobRecord> GetWaitingList(int maxResultCount);
-
         Task<List<BackgroundJobRecord>> GetWaitingListAsync(int maxResultCount);
     }
 }
\ No newline at end of file
diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/EfCoreBackgroundJobRepository.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/EfCoreBackgroundJobRepository.cs
index 8128d18bfb..8c786c9f37 100644
--- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/EfCoreBackgroundJobRepository.cs
+++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/EfCoreBackgroundJobRepository.cs
@@ -21,12 +21,6 @@ namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore
             Clock = clock;
         }
 
-        public List<BackgroundJobRecord> GetWaitingList(int maxResultCount)
-        {
-            return GetWaitingListQuery(maxResultCount)
-                .ToList();
-        }
-
         public async Task<List<BackgroundJobRecord>> GetWaitingListAsync(int maxResultCount)
         {
             return await GetWaitingListQuery(maxResultCount)
diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/MongoBackgroundJobRepository.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/MongoBackgroundJobRepository.cs
index fe3ffa7e07..33903c1e9f 100644
--- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/MongoBackgroundJobRepository.cs
+++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/MongoBackgroundJobRepository.cs
@@ -21,12 +21,6 @@ namespace Volo.Abp.BackgroundJobs.MongoDB
             Clock = clock;
         }
 
-        public List<BackgroundJobRecord> GetWaitingList(int maxResultCount)
-        {
-            return GetWaitingListQuery(maxResultCount)
-                .ToList();
-        }
-
         public async Task<List<BackgroundJobRecord>> GetWaitingListAsync(int maxResultCount)
         {
             return await GetWaitingListQuery(maxResultCount)
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/ITenantRepository.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/ITenantRepository.cs
index 1feca866a2..90a4440fe8 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/ITenantRepository.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/ITenantRepository.cs
@@ -13,16 +13,6 @@ namespace Volo.Abp.TenantManagement
             bool includeDetails = true, 
             CancellationToken cancellationToken = default);
 
-        Tenant FindByName(
-            string name,
-            bool includeDetails = true
-        );
-
-        Tenant FindById(
-            Guid id,
-            bool includeDetails = true
-        );
-
         Task<List<Tenant>> GetListAsync(
             string sorting = null, 
             int maxResultCount = int.MaxValue, 
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
index afa9af0cf2..0e5cf9d95b 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
@@ -51,33 +51,5 @@ namespace Volo.Abp.TenantManagement
                 return _objectMapper.Map<Tenant, TenantConfiguration>(tenant);
             }
         }
-
-        public TenantConfiguration Find(string name)
-        {
-            using (_currentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
-            {
-                var tenant = _tenantRepository.FindByName(name);
-                if (tenant == null)
-                {
-                    return null;
-                }
-
-                return _objectMapper.Map<Tenant, TenantConfiguration>(tenant);
-            }
-        }
-
-        public TenantConfiguration Find(Guid id)
-        {
-            using (_currentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
-            {
-                var tenant = _tenantRepository.FindById(id);
-                if (tenant == null)
-                {
-                    return null;
-                }
-
-                return _objectMapper.Map<Tenant, TenantConfiguration>(tenant);
-            }
-        }
     }
 }