diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index 593d29096..030ecde57 100755
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -871,12 +871,12 @@ namespace ArchiSteamFarm {
 				return "That bot doesn't have ASF 2FA enabled!";
 			}
 
-			Tuple<string, byte> tokenTimePair = await BotDatabase.MobileAuthenticator.GenerateTokenTimePair().ConfigureAwait(false);
-			if (tokenTimePair == null) {
+			string token = await BotDatabase.MobileAuthenticator.GenerateToken().ConfigureAwait(false);
+			if (string.IsNullOrEmpty(token)) {
 				return "Error!";
 			}
 
-			return "2FA Token: " + tokenTimePair.Item1 + " (expires in " + tokenTimePair.Item2 + " seconds)";
+			return "2FA Token: " + token;
 		}
 
 		private static async Task<string> Response2FA(ulong steamID, string botName) {
diff --git a/ArchiSteamFarm/MobileAuthenticator.cs b/ArchiSteamFarm/MobileAuthenticator.cs
index 8d31e9694..005444748 100644
--- a/ArchiSteamFarm/MobileAuthenticator.cs
+++ b/ArchiSteamFarm/MobileAuthenticator.cs
@@ -195,17 +195,6 @@ namespace ArchiSteamFarm {
 			return null;
 		}
 
-		internal async Task<Tuple<string, byte>> GenerateTokenTimePair() {
-			uint time = await GetSteamTime().ConfigureAwait(false);
-			if (time == 0) {
-				Logging.LogNullError(nameof(time), Bot.BotName);
-				return null;
-			}
-
-			byte timeLeft = (byte) (CodeInterval - time % CodeInterval);
-			return new Tuple<string, byte>(GenerateTokenForTime(time), timeLeft);
-		}
-
 		internal async Task<HashSet<Confirmation>> GetConfirmations() {
 			if (!HasCorrectDeviceID) {
 				Logging.LogGenericWarning("Can't execute properly due to invalid DeviceID!", Bot.BotName);