diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index ae3e9bf87a..80cfe18cf9 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -9,9 +9,6 @@ using Microsoft.IdentityModel.Tokens;
 using Bit.Api.Utilities;
 using Bit.Core;
 using Bit.Core.Identity;
-using System.Linq;
-using Microsoft.AspNetCore.Mvc.Formatters;
-using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json.Serialization;
 using AspNetCoreRateLimit;
 using Serilog.Events;
@@ -20,7 +17,6 @@ using Bit.Core.Utilities;
 using IdentityModel;
 using IdentityServer4.AccessTokenValidation;
 using jsreport.AspNetCore;
-using Bit.Core.IdentityServer;
 
 namespace Bit.Api
 {
@@ -84,8 +80,6 @@ namespace Bit.Api
                     options.RequireHttpsMetadata = !Environment.IsDevelopment() &&
                         globalSettings.BaseServiceUri.InternalIdentity.StartsWith("https");
                     options.NameClaimType = ClaimTypes.Email;
-                    options.TokenRetriever = TokenRetrieval.FromAuthorizationHeaderOrQueryString(
-                        new string[] { "Bearer", "Bearer3" });
                     options.SupportedTokens = SupportedTokens.Jwt;
                 });
 
@@ -127,14 +121,7 @@ namespace Bit.Api
             {
                 config.Filters.Add(new ExceptionHandlerFilterAttribute());
                 config.Filters.Add(new ModelStateValidationFilterAttribute());
-
-                // Allow JSON of content type "text/plain" to avoid cors preflight
-                var textPlainMediaType = MediaTypeHeaderValue.Parse("text/plain");
-                foreach(var jsonFormatter in config.InputFormatters.OfType<JsonInputFormatter>())
-                {
-                    jsonFormatter.SupportedMediaTypes.Add(textPlainMediaType);
-                }
-            }).AddJsonOptions(options => options.SerializerSettings.ContractResolver = new DefaultContractResolver());
+            }).AddJsonOptions(o => o.SerializerSettings.ContractResolver = new DefaultContractResolver());
 
             // PDF generation
             if(!globalSettings.SelfHosted)
diff --git a/src/Core/IdentityServer/TokenRetrieval.cs b/src/Core/IdentityServer/TokenRetrieval.cs
deleted file mode 100644
index b16708640d..0000000000
--- a/src/Core/IdentityServer/TokenRetrieval.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using System;
-using System.Linq;
-
-namespace Bit.Core.IdentityServer
-{
-    public static class TokenRetrieval
-    {
-        public static Func<HttpRequest, string> FromAuthorizationHeaderOrQueryString(string[] authHeaderSchemes)
-        {
-            return (request) =>
-            {
-                var authorization = request.Headers["Authorization"].FirstOrDefault();
-
-                if(string.IsNullOrWhiteSpace(authorization))
-                {
-                    // Bearer token could exist in the 'Content-Language' header on clients that want to avoid pre-flights.
-                    var languageAuth = request.Headers["Content-Language"].FirstOrDefault();
-                    if(string.IsNullOrWhiteSpace(languageAuth) ||
-                        !languageAuth.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
-                    {
-                        return request.Query["access_token"].FirstOrDefault();
-                    }
-                    else
-                    {
-                        authorization = languageAuth.Split(',')[0];
-                    }
-                }
-
-                foreach(var headerScheme in authHeaderSchemes)
-                {
-                    if(authorization.StartsWith($"{headerScheme} ", StringComparison.OrdinalIgnoreCase))
-                    {
-                        return authorization.Substring(headerScheme.Length + 1).Trim();
-                    }
-                }
-
-                return null;
-            };
-        }
-    }
-}
diff --git a/src/Events/Startup.cs b/src/Events/Startup.cs
index f80f2d1604..22ced478b6 100644
--- a/src/Events/Startup.cs
+++ b/src/Events/Startup.cs
@@ -1,6 +1,5 @@
 using System.Security.Claims;
 using Bit.Core;
-using Bit.Core.IdentityServer;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using IdentityModel;
@@ -48,8 +47,6 @@ namespace Bit.Events
                     options.RequireHttpsMetadata = !Environment.IsDevelopment() &&
                         globalSettings.BaseServiceUri.InternalIdentity.StartsWith("https");
                     options.NameClaimType = ClaimTypes.Email;
-                    options.TokenRetriever = TokenRetrieval.FromAuthorizationHeaderOrQueryString(
-                        new string[] { "Bearer", "Bearer3" });
                     options.SupportedTokens = SupportedTokens.Jwt;
                 });