diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Toolbars/BasicThemeMainTopToolbarContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Toolbars/BasicThemeMainTopToolbarContributor.cs
index e0738d424f..1ed1d2d5d3 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Toolbars/BasicThemeMainTopToolbarContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Toolbars/BasicThemeMainTopToolbarContributor.cs
@@ -10,22 +10,23 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Toolbars
 {
     public class BasicThemeMainTopToolbarContributor : IToolbarContributor
     {
-        public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
+        public async Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
         {
             if (context.Toolbar.Name != StandardToolbars.Main)
             {
-                return Task.CompletedTask;
+                return;
             }
 
             if (!(context.Theme is BasicTheme))
             {
-                return Task.CompletedTask;
+                return;
             }
 
             var languageProvider = context.ServiceProvider.GetService<ILanguageProvider>();
 
             //TODO: This duplicates GetLanguages() usage. Can we eleminate this?
-            if (languageProvider.GetLanguages().Count > 1)
+            var languages = await languageProvider.GetLanguagesAsync();
+            if (languages.Count > 1)
             {
                 context.Toolbar.Items.Add(new ToolbarItem(typeof(LanguageSwitchViewComponent)));
             }
@@ -34,8 +35,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Toolbars
             {
                 context.Toolbar.Items.Add(new ToolbarItem(typeof(UserMenuViewComponent)));
             }
-
-            return Task.CompletedTask;
         }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
index 25a9d38d06..c0cc9f228c 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Builder
             using (var scope = app.ApplicationServices.CreateScope())
             {
                 var languageProvider = scope.ServiceProvider.GetRequiredService<ILanguageProvider>();
-                languages = languageProvider.GetLanguages();
+                languages = AsyncHelper.RunSync(() => languageProvider.GetLanguagesAsync());
 
                 var settingProvider = scope.ServiceProvider.GetRequiredService<ISettingProvider>();
                 defaultLanguage = settingProvider.GetOrNull(LocalizationSettingNames.DefaultLanguage);
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Authentication/IRemoteServiceHttpClientAuthenticator.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Authentication/IRemoteServiceHttpClientAuthenticator.cs
index 920d38f2e6..480ba049e6 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Authentication/IRemoteServiceHttpClientAuthenticator.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Authentication/IRemoteServiceHttpClientAuthenticator.cs
@@ -4,6 +4,6 @@ namespace Volo.Abp.Http.Client.Authentication
 {
     public interface IRemoteServiceHttpClientAuthenticator
     {
-        Task Authenticate(RemoteServiceHttpClientAuthenticateContext context);
+        Task Authenticate(RemoteServiceHttpClientAuthenticateContext context); //TODO: Rename to AuthenticateAsync
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageProviderExtensions.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageProviderExtensions.cs
deleted file mode 100644
index 951292ac66..0000000000
--- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageProviderExtensions.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using Volo.Abp.Threading;
-
-namespace Volo.Abp.Localization
-{
-    public static class LanguageProviderExtensions
-    {
-        public static IReadOnlyList<LanguageInfo> GetLanguages(this ILanguageProvider languageProvider)
-        {
-            return AsyncHelper.RunSync(languageProvider.GetLanguagesAsync);
-        }
-    }
-}
\ No newline at end of file