diff --git a/src/Twilio/Base/BearerToken/TokenResourceSet.cs b/src/Twilio/Base/BearerToken/TokenResourceSet.cs
deleted file mode 100644
index dfaec4c39..000000000
--- a/src/Twilio/Base/BearerToken/TokenResourceSet.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-using Twilio.Clients;
-using Twilio.Clients.BearerToken;
-using Twilio.Annotations;
-
-namespace Twilio.Base.BearerToken
-{
-    /// <summary>
-    /// A collection of resources of type T
-    /// </summary>
-    ///
-    /// <typeparam name="T">Resource Type</typeparam>
-    [Beta]
-    public class TokenResourceSet<T> : IEnumerable<T> where T : Resource
-    {
-        /// <summary>
-        /// Automatically iterate through pages of results
-        /// </summary>
-        public bool AutoPaging { get; set; }
-
-        private readonly TwilioOrgsTokenRestClient _client;
-        private readonly ReadOptions<T> _options;
-        private readonly long _pageLimit;
-
-        private long _pages;
-        private long _processed;
-        private Page<T> _page;
-        private IEnumerator<T> _iterator;
-
-        /// <summary>
-        /// Create a new resource set
-        /// </summary>
-        ///
-        /// <param name="page">Page of resources</param>
-        /// <param name="options">Read options</param>
-        /// <param name="client">Client to make requests</param>
-        public TokenResourceSet(Page<T> page, ReadOptions<T> options, TwilioOrgsTokenRestClient client)
-        {
-            _page = page;
-            _options = options;
-            _client = client;
-
-            _iterator = page.Records.GetEnumerator();
-            _processed = 0;
-            _pages = 1;
-            _pageLimit = long.MaxValue;
-
-            AutoPaging = true;
-
-            if (_options.Limit != null)
-            {
-                _pageLimit = (long) (Math.Ceiling((double) _options.Limit.Value / page.PageSize));
-            }
-        }
-
-        /// <summary>
-        /// Get iterator for resources
-        /// </summary>
-        ///
-        /// <returns>IEnumerator of resources</returns>
-        public IEnumerator<T> GetEnumerator()
-        {
-            while (_page != null)
-            {
-                _iterator.Reset();
-                while (_iterator.MoveNext())
-                {
-                    // Exit if we've reached item limit
-                    if (_options.Limit != null && _processed > _options.Limit.Value)
-                    {
-                        yield break;
-                    }
-
-                    _processed++;
-                    yield return _iterator.Current;
-                }
-
-                if (AutoPaging && _page.HasNextPage())
-                {
-                    FetchNextPage();
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get iterator for resources
-        /// </summary>
-        ///
-        /// <returns>IEnumerator of resources</returns>
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        private void FetchNextPage()
-        {
-            if (!_page.HasNextPage() || _pages >= _pageLimit)
-            {
-                _page = null;
-                _iterator = null;
-                return;
-            }
-
-            _pages++;
-            _page = (Page<T>)GetNextPage().Invoke(null, new object[]{ _page, _client });
-            _iterator = _page.Records.GetEnumerator();
-        }
-
-        private static MethodInfo GetNextPage()
-        {
-#if !NET35
-            return typeof(T).GetRuntimeMethod("NextPage", new[]{ typeof(Page<T>), typeof(TwilioOrgsTokenRestClient) });
-#else
-            return typeof(T).GetMethod("NextPage", new[]{ typeof(Page<T>), typeof(TwilioOrgsTokenRestClient) });
-#endif
-        }
-    }
-}
diff --git a/src/Twilio/Clients/BearerToken/TwilioOrgsTokenRestClient.cs b/src/Twilio/Clients/BearerToken/TwilioOrgsTokenRestClient.cs
deleted file mode 100644
index 6ac86fcf4..000000000
--- a/src/Twilio/Clients/BearerToken/TwilioOrgsTokenRestClient.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-using System;
-using System.Net;
-using System.Linq;
-using Newtonsoft.Json;
-using Twilio.Exceptions;
-using Twilio.Http.BearerToken;
-using Twilio.Jwt;
-using Twilio.Clients;
-using Twilio.Annotations;
-
-#if !NET35
-using System.IdentityModel.Tokens.Jwt;
-using System.Threading.Tasks;
-#endif
-
-using Twilio.Http;
-using Twilio.Http.BearerToken;
-#if NET35
-using Twilio.Http.Net35;
-using System.Collections.Generic;
-using System.Text;
-using System.Web.Script.Serialization;
-#endif
-
-
-namespace Twilio.Clients.BearerToken
-{
-    /// <summary>
-    /// Implementation of a TwilioRestClient.
-    /// </summary>
-    [Deprecated]
-    public class TwilioOrgsTokenRestClient
-    {
-        /// <summary>
-        /// Client to make HTTP requests
-        /// </summary>
-        public TokenHttpClient HttpClient { get; }
-
-        /// <summary>
-        /// Twilio region to make requests to
-        /// </summary>
-        public string Region { get; }
-
-        /// <summary>
-        /// Twilio edge to make requests to
-        /// </summary>
-        public string Edge { get; set; }
-
-        /// <summary>
-        /// Additions to the user agent string
-        /// </summary>
-        public string[] UserAgentExtensions { get; set; }
-
-        /// <summary>
-        /// Log level for logging
-        /// </summary>
-        public string LogLevel { get; set; } = Environment.GetEnvironmentVariable("TWILIO_LOG_LEVEL");
-
-        /// <summary>
-        /// Token Manage for managing and refreshing tokens
-        /// </summary>
-        private TokenManager _tokenManager { get; set; }
-
-        /// <summary>
-        /// Access token used for rest calls with bearer token authentication method
-        /// </summary>
-        private string _accessToken;
-
-        private readonly object lockObject = new object();
-
-        /// <summary>
-        /// Constructor for a TwilioRestClient
-        /// </summary>
-        ///
-        /// <param name="tokenManager">to manage access token for requests</param>
-        /// <param name="accountSid">account sid to make requests for</param>
-        /// <param name="region">region to make requests for</param>
-        /// <param name="httpClient">http client used to make the requests</param>
-        /// <param name="edge">edge to make requests for</param>
-        public TwilioOrgsTokenRestClient(
-            TokenManager tokenManager,
-            string region = null,
-            TokenHttpClient httpClient = null,
-            string edge = null
-        )
-        {
-            _tokenManager = tokenManager;
-
-            HttpClient = httpClient ?? DefaultClient();
-
-            Region = region;
-            Edge = edge;
-        }
-
-        /// <summary>
-        /// Check if an access token is expired or not. Use the System.IdentityModel.Tokens.Jwt; for versions other
-        /// than net35 and use redirect to custom function if net35
-        /// </summary>
-        ///
-        /// <param name="accessToken">access token for which expiry have to be checked</param>
-        /// <returns>true if expired, false otherwise</returns>
-        public bool tokenExpired(String accessToken){
-            #if NET35
-            return IsTokenExpired(accessToken);
-            #else
-            return isTokenExpired(accessToken);
-            #endif
-        }
-
-        /// <summary>
-        /// Make a request to the Twilio API
-        /// </summary>
-        ///
-        /// <param name="request">request to make</param>
-        /// <returns>response of the request</returns>
-        public Response Request(TokenRequest request)
-        {
-            if ((_accessToken == null )|| tokenExpired(_accessToken)) {
-                lock (lockObject){
-                    if ((_accessToken == null) || tokenExpired(_accessToken)) {
-                        _accessToken = _tokenManager.fetchAccessToken();
-                    }
-                }
-            }
-            request.SetAuth(_accessToken);
-
-            if (LogLevel == "debug")
-                LogRequest(request);
-
-            if (Region != null)
-                request.Region = Region;
-
-            if (Edge != null)
-                request.Edge = Edge;
-
-            if (UserAgentExtensions != null)
-                request.UserAgentExtensions = UserAgentExtensions;
-
-            Response response;
-            try
-            {
-                response = HttpClient.MakeRequest(request);
-                if (LogLevel == "debug")
-                {
-                    Console.WriteLine("response.status: " + response.StatusCode);
-                    Console.WriteLine("response.headers: " + response.Headers);
-                }
-            }
-            catch (Exception clientException)
-            {
-                throw new ApiConnectionException(
-                    "Connection Error: " + request.Method + request.ConstructUrl(),
-                    clientException
-                );
-            }
-            return ProcessResponse(response);
-        }
-
-#if NET35
-    public static bool IsTokenExpired(string token)
-        {
-            try
-            {
-                // Split the token into its components
-                var parts = token.Split('.');
-                if (parts.Length != 3)
-                    throw new ArgumentException("Malformed token received");
-
-                // Decode the payload (the second part of the JWT)
-                string payload = Base64UrlEncoder.Decode(parts[1]);
-
-                // Parse the payload JSON
-                var serializer = new JavaScriptSerializer();
-                var payloadData = serializer.Deserialize<Dictionary<string, object>>(payload);
-
-                // Check the 'exp' claim
-                if (payloadData.TryGetValue("exp", out object expObj))
-                {
-                    if (long.TryParse(expObj.ToString(), out long exp))
-                    {
-                        DateTime expirationDate = UnixTimeStampToDateTime(exp);
-                        return DateTime.UtcNow > expirationDate;
-                    }
-                }
-
-                // If 'exp' claim is missing or not a valid timestamp, consider the token expired
-                throw new ApiConnectionException("token expired 1");
-                return true;
-            }
-            catch (Exception ex)
-            {
-                // Handle exceptions (e.g., malformed token or invalid JSON)
-                Console.WriteLine($"Error checking token expiration: {ex.Message}");
-                throw new ApiConnectionException("token expired 2");
-                return true; // Consider as expired if there's an error
-            }
-        }
-
-        private static DateTime UnixTimeStampToDateTime(long unixTimeStamp)
-        {
-            // Unix timestamp is seconds past epoch
-            var epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-            return epoch.AddSeconds(unixTimeStamp);
-        }
-#endif
-
-#if !NET35
-        public bool isTokenExpired(string token){
-            var handler = new JwtSecurityTokenHandler();
-            try{
-                var jwtToken = handler.ReadJwtToken(token);
-                var exp = jwtToken.Payload.Exp;
-                if (exp.HasValue)
-                    {
-                        var expirationDate = DateTimeOffset.FromUnixTimeSeconds(exp.Value).UtcDateTime;
-                        return DateTime.UtcNow > expirationDate;
-                    }
-                else
-                {
-                    return true; // Assuming token is expired if exp claim is missing
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"Error reading token: {ex.Message}");
-
-                return true; // Treat as expired if there is an error
-            }
-        }
-#endif
-
-#if !NET35
-        /// <summary>
-        /// Make a request to the Twilio API
-        /// </summary>
-        ///
-        /// <param name="request">request to make</param>
-        /// <returns>Task that resolves to the response of the request</returns>
-        public async Task<Response> RequestAsync(TokenRequest request)
-        {
-            request.SetAuth(_accessToken);
-
-            if (Region != null)
-                request.Region = Region;
-
-            if (Edge != null)
-                request.Edge = Edge;
-
-            if (UserAgentExtensions != null)
-                request.UserAgentExtensions = UserAgentExtensions;
-
-            Response response;
-            try
-            {
-                response = await HttpClient.MakeRequestAsync(request);
-            }
-            catch (Exception clientException)
-            {
-                throw new ApiConnectionException(
-                    "Connection Error: " + request.Method + request.ConstructUrl(),
-                    clientException
-                );
-            }
-            return ProcessResponse(response);
-        }
-
-        private static TokenHttpClient DefaultClient()
-        {
-            return new SystemNetTokenHttpClient();
-        }
-#else
-        private static TokenHttpClient DefaultClient()
-        {
-            return new WebBearerTokenRequestClient();
-        }
-#endif
-
-        private static Response ProcessResponse(Response response)
-        {
-            if (response == null)
-            {
-                throw new ApiConnectionException("Connection Error: No response received.");
-            }
-
-
-            if (response.StatusCode >= HttpStatusCode.OK && response.StatusCode < HttpStatusCode.BadRequest)
-            {
-                return response;
-            }
-
-            // Deserialize and throw exception
-            RestException restException = null;
-            try
-            {
-                restException = RestException.FromJson(response.Content);
-            }
-            catch (JsonReaderException) { /* Allow null check below to handle */ }
-
-            if (restException == null)
-            {
-                throw new ApiException("Api Error: " + response.StatusCode + " - " + (response.Content ?? "[no content]"));
-            }
-
-            throw new ApiException(
-                restException.Code,
-                (int)response.StatusCode,
-                restException.Message ?? "Unable to make request, " + response.StatusCode,
-                restException.MoreInfo,
-                restException.Details
-            );
-        }
-
-        /// <summary>
-        /// Test if your environment is impacted by a TLS or certificate change 
-        /// by sending an HTTP request to the test endpoint tls-test.twilio.com:443
-        /// It's a bit easier to call this method from TwilioClient.ValidateSslCertificate().
-        /// </summary>
-        public static void ValidateSslCertificate()
-        {
-            ValidateSslCertificate(DefaultClient());
-        }
-
-        /// <summary>
-        /// Test that this application can use updated SSL certificates on
-        /// tls-test.twilio.com:443. Generally, you'll want to use the version of this
-        /// function that takes no parameters unless you have a reason not to.
-        /// </summary>
-        ///
-        /// <param name="client">HTTP Client to use for testing the request</param>
-        public static void ValidateSslCertificate(TokenHttpClient client)
-        {
-            TokenRequest request = new TokenRequest("GET", "tls-test", ":443/", null);
-
-            try
-            {
-                Response response = client.MakeRequest(request);
-
-                if (!response.StatusCode.Equals(HttpStatusCode.OK))
-                {
-                    throw new CertificateValidationException(
-                        "Unexpected response from certificate endpoint",
-                        null,
-                        response
-                    );
-                }
-            }
-            catch (CertificateValidationException e)
-            {
-                throw e;
-            }
-            catch (Exception e)
-            {
-                throw new CertificateValidationException(
-                    "Connection to tls-test.twilio.com:443 failed",
-                    e,
-                    null
-                );
-            }
-        }
-
-        /// <summary>
-        /// Format request information when LogLevel is set to debug
-        /// </summary>
-        ///
-        /// <param name="request">HTTP request</param>
-        private static void LogRequest(TokenRequest request)
-        {
-            Console.WriteLine("-- BEGIN Twilio API Request --");
-            Console.WriteLine("request.method: " + request.Method);
-            Console.WriteLine("request.URI: " + request.Uri);
-
-            if (request.QueryParams != null)
-            {
-                request.QueryParams.ForEach(parameter => Console.WriteLine(parameter.Key + ":" + parameter.Value));
-            }
-
-            if (request.HeaderParams != null)
-            {
-                for (int i = 0; i < request.HeaderParams.Count; i++)
-                {
-                    var lowercaseHeader = request.HeaderParams[i].Key.ToLower();
-                    if (lowercaseHeader.Contains("authorization") == false)
-                    {
-                        Console.WriteLine(request.HeaderParams[i].Key + ":" + request.HeaderParams[i].Value);
-                    }
-                }
-            }
-
-            Console.WriteLine("-- END Twilio API Request --");
-        }
-    }
-}
diff --git a/src/Twilio/Twilio.csproj b/src/Twilio/Twilio.csproj
index 44b3a0a8d..66c08fde8 100644
--- a/src/Twilio/Twilio.csproj
+++ b/src/Twilio/Twilio.csproj
@@ -38,14 +38,14 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.3.1" />
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.3.1" />
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
diff --git a/src/Twilio/TwilioOrgsTokenAuth.cs b/src/Twilio/TwilioOrgsTokenAuth.cs
deleted file mode 100644
index 0593af2e4..000000000
--- a/src/Twilio/TwilioOrgsTokenAuth.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-using Twilio.Clients;
-using Twilio.Clients.NoAuth;
-using Twilio.Clients.BearerToken;
-using Twilio.Exceptions;
-using Twilio.Http.BearerToken;
-using Twilio.Annotations;
-
-
-namespace Twilio
-{
-    /// <summary>
-    /// Default Twilio Client for bearer token authentication
-    /// </summary>
-    [Beta]
-    public class TwilioOrgsTokenAuthClient
-    {
-        private static string _accessToken;
-        private static string _region;
-        private static string _edge;
-        private static TwilioOrgsTokenRestClient _restClient;
-        private static TwilioNoAuthRestClient _noAuthRestClient;
-        private static string _logLevel;
-        private static TokenManager _tokenManager;
-        private static string _clientId;
-        private static string _clientSecret;
-
-        private TwilioOrgsTokenAuthClient() { }
-
-        /// <summary>
-        /// Initialize base client with username and password
-        /// </summary>
-        public static void Init(string clientId, string clientSecret)
-        {
-            SetClientId(clientId);
-            SetClientSecret(clientSecret);
-            SetTokenManager(new OrgsTokenManager(clientId, clientSecret));
-        }
-
-
-        /// <summary>
-        /// Initialize base client
-        /// </summary>
-        public static void Init(string clientId, string clientSecret,
-                               string code = null,
-                               string redirectUri = null,
-                               string audience = null,
-                               string refreshToken = null,
-                               string scope = null)
-        {
-            SetClientId(clientId);
-            SetClientSecret(clientSecret);
-            SetTokenManager(new OrgsTokenManager(clientId, clientSecret, code, redirectUri, audience, refreshToken, scope));
-        }
-
-        /// <summary>
-        /// Set the token manager
-        /// </summary>
-        /// <param name="tokenManager">token manager</param>
-        public static void SetTokenManager(TokenManager tokenManager)
-        {
-            if (tokenManager == null)
-            {
-                throw new AuthenticationException("Token Manager  can not be null");
-            }
-
-            if (tokenManager != _tokenManager)
-            {
-                Invalidate();
-            }
-
-            _tokenManager = tokenManager;
-        }
-
-        /// <summary>
-        /// Set the client id
-        /// </summary>
-        /// <param name="clientId">client id of the organisation</param>
-        public static void SetClientId(string clientId)
-        {
-            if (clientId == null)
-            {
-                throw new AuthenticationException("Client Id  can not be null");
-            }
-
-            if (clientId != _clientId)
-            {
-                Invalidate();
-            }
-
-            _clientId = clientId;
-        }
-
-        /// <summary>
-        /// Set the client secret
-        /// </summary>
-        /// <param name="clientSecret">client secret of the organisation</param>
-        public static void SetClientSecret(string clientSecret)
-        {
-            if (clientSecret == null)
-            {
-                throw new AuthenticationException("Client Secret  can not be null");
-            }
-
-            if (clientSecret != _clientSecret)
-            {
-                Invalidate();
-            }
-
-            _clientSecret = clientSecret;
-        }
-
-        /// <summary>
-        /// Set the client region
-        /// </summary>
-        /// <param name="region">Client region</param>
-        public static void SetRegion(string region)
-        {
-            if (region != _region)
-            {
-                Invalidate();
-                InvalidateNoAuthClient();
-            }
-            _region = region;
-        }
-
-        /// <summary>
-        /// Set the client edge
-        /// </summary>
-        /// <param name="edge">Client edge</param>
-        public static void SetEdge(string edge)
-        {
-            if (edge != _edge)
-            {
-                Invalidate();
-                InvalidateNoAuthClient();
-            }
-            _edge = edge;
-        }
-
-        /// <summary>
-        /// Set the logging level
-        /// </summary>
-        /// <param name="loglevel">log level</param>
-        public static void SetLogLevel(string loglevel)
-        {
-            if (loglevel != _logLevel)
-            {
-                Invalidate();
-                InvalidateNoAuthClient();
-            }
-            _logLevel = loglevel;
-        }
-
-        /// <summary>
-        /// Get the rest client
-        /// </summary>
-        /// <returns>The rest client</returns>
-        public static TwilioOrgsTokenRestClient GetRestClient()
-        {
-            if (_restClient != null)
-            {
-                return _restClient;
-            }
-
-            if (_tokenManager == null)
-            {
-                throw new AuthenticationException(
-                    "TwilioBearerTokenRestClient was used before token manager was set, please call TwilioClient.init()"
-                );
-            }
-
-            _restClient = new TwilioOrgsTokenRestClient(_tokenManager, region: _region, edge: _edge)
-            {
-                LogLevel = _logLevel
-            };
-            return _restClient;
-        }
-
-
-        /// <summary>
-        /// Get the noauth rest client
-        /// </summary>
-        /// <returns>The not auth rest client</returns>
-        public static TwilioNoAuthRestClient GetNoAuthRestClient()
-        {
-            if (_noAuthRestClient != null)
-            {
-                return _noAuthRestClient;
-            }
-
-            _noAuthRestClient = new TwilioNoAuthRestClient(region: _region, edge: _edge)
-            {
-                LogLevel = _logLevel
-            };
-            return _noAuthRestClient;
-        }
-
-        /// <summary>
-        /// Set the rest client
-        /// </summary>
-        /// <param name="restClient">Rest Client to use</param>
-        public static void SetRestClient(TwilioOrgsTokenRestClient restClient)
-        {
-            _restClient = restClient;
-        }
-
-        /// <summary>
-        /// Clear out the Rest Client
-        /// </summary>
-        public static void Invalidate()
-        {
-            _restClient = null;
-        }
-
-        /// <summary>
-        /// Clear out the Rest Client
-        /// </summary>
-        public static void InvalidateNoAuthClient()
-        {
-            _noAuthRestClient = null;
-        }
-
-        /// <summary>
-        /// Test if your environment is impacted by a TLS or certificate change
-        /// by sending an HTTP request to the test endpoint tls-test.twilio.com:443
-        /// </summary>
-        public static void ValidateSslCertificate()
-        {
-            TwilioRestClient.ValidateSslCertificate();
-        }
-    }
-}
diff --git a/test/Twilio.Test/ClusterTest.cs b/test/Twilio.Test/ClusterTest.cs
index 3c149f715..25fd5dd54 100644
--- a/test/Twilio.Test/ClusterTest.cs
+++ b/test/Twilio.Test/ClusterTest.cs
@@ -43,7 +43,7 @@ public void SetUp()
             oAuthClientSecret = Environment.GetEnvironmentVariable("TWILIO_CLIENT_SECRET");
             oAuthMessageId = Environment.GetEnvironmentVariable("TWILIO_MESSAGE_SID");
             TwilioClient.Init(username:apiKey,password:secret,accountSid:accountSid);
-            TwilioOrgsTokenAuthClient.Init(clientId, clientSecret);
+            //TwilioOrgsTokenAuthClient.Init(clientId, clientSecret);
         }