diff --git a/src/Discord.Net.Core/Entities/Activities/Game.cs b/src/Discord.Net.Core/Entities/Activities/Game.cs
index 9e6efc5e7..d2d088a41 100644
--- a/src/Discord.Net.Core/Entities/Activities/Game.cs
+++ b/src/Discord.Net.Core/Entities/Activities/Game.cs
@@ -13,7 +13,7 @@ namespace Discord
         /// <inheritdoc/>
         public ActivityType Type { get; internal set; }
         /// <inheritdoc/>
-        public int Flags { get; internal set; }
+        public ActivityFlag Flags { get; internal set; }
 
         internal Game() { }
         /// <summary>
diff --git a/src/Discord.Net.Core/Entities/Activities/IActivity.cs b/src/Discord.Net.Core/Entities/Activities/IActivity.cs
index 44fa43d6c..869d780c9 100644
--- a/src/Discord.Net.Core/Entities/Activities/IActivity.cs
+++ b/src/Discord.Net.Core/Entities/Activities/IActivity.cs
@@ -24,11 +24,10 @@ namespace Discord
         /// </summary>
         /// <remarks>
         ///     This value is determined by bitwise OR-ing <see cref="ActivityFlag"/> values together.
-        ///     Each flag's value can be checked using <see cref="ActivityExtensions.CheckActivityFlag(IActivity, ActivityFlag)"/>
         /// </remarks>
         /// <returns>
         ///     The value of flags for this activity.
         /// </returns>
-        int Flags { get; }
+        ActivityFlag Flags { get; }
     }
 }
diff --git a/src/Discord.Net.Core/Entities/Users/IUser.cs b/src/Discord.Net.Core/Entities/Users/IUser.cs
index 2ad23a518..ae0b16a72 100644
--- a/src/Discord.Net.Core/Entities/Users/IUser.cs
+++ b/src/Discord.Net.Core/Entities/Users/IUser.cs
@@ -117,12 +117,11 @@ namespace Discord
         /// </summary>
         /// <remarks>
         ///     This value is determined by bitwise OR-ing <see cref="UserFlag"/> values together.
-        ///     Each flag's value can be checked using <see cref="UserExtensions.CheckUserFlag(IUser, UserFlag)"/>
         /// </remarks>
         /// <returns>
         ///     The value of flags for this user.
         /// </returns>
-        int Flags { get; }
+        UserFlag Flags { get; }
         /// <summary>
         ///     The type of Nitro subscription that is active on this user's account.
         /// </summary>
diff --git a/src/Discord.Net.Core/Extensions/ActivityExtensions.cs b/src/Discord.Net.Core/Extensions/ActivityExtensions.cs
deleted file mode 100644
index 220b54dbc..000000000
--- a/src/Discord.Net.Core/Extensions/ActivityExtensions.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Discord
-{
-    /// <summary>
-    ///     Extension methods for the <see cref="IActivity"/> types.
-    /// </summary>
-    public static class ActivityExtensions
-    {
-        /// <summary>
-        ///     Determines if the given flag is enabled with this activity.
-        /// </summary>
-        /// <param name="user">The user to check.</param>
-        /// <param name="flag">The <see cref="ActivityFlag"/> to check for.</param>
-        /// <returns>
-        ///     True if the activity has this flag enabled, false otherwise.
-        /// </returns>
-        public static bool CheckActivityFlag(this IActivity activity, ActivityFlag flag)
-            => (activity.Flags & (int)flag) >= (int)flag;
-    }
-}
diff --git a/src/Discord.Net.Core/Extensions/UserExtensions.cs b/src/Discord.Net.Core/Extensions/UserExtensions.cs
index 92a1d3769..f98bf7227 100644
--- a/src/Discord.Net.Core/Extensions/UserExtensions.cs
+++ b/src/Discord.Net.Core/Extensions/UserExtensions.cs
@@ -160,16 +160,5 @@ namespace Discord
         /// </returns>
         public static Task BanAsync(this IGuildUser user, int pruneDays = 0, string reason = null, RequestOptions options = null)
             => user.Guild.AddBanAsync(user, pruneDays, reason, options);
-
-        /// <summary>
-        ///     Determines if the user has a given flag applied to their account.
-        /// </summary>
-        /// <param name="user">The user to check.</param>
-        /// <param name="flag">The <see cref="UserFlag"/> to check for.</param>
-        /// <returns>
-        ///     True if the user has the given flag on their account, otherwise false.
-        /// </returns>
-        public static bool CheckUserFlag(this IUser user, UserFlag flag)
-            => (user.Flags & (int)flag) >= (int)flag;
     }
 }
diff --git a/src/Discord.Net.Rest/API/Common/Game.cs b/src/Discord.Net.Rest/API/Common/Game.cs
index 09c74b1dc..d58b7b98b 100644
--- a/src/Discord.Net.Rest/API/Common/Game.cs
+++ b/src/Discord.Net.Rest/API/Common/Game.cs
@@ -34,7 +34,7 @@ namespace Discord.API
         [JsonProperty("session_id")]
         public Optional<string> SessionId { get; set; }
         [JsonProperty("Flags")]
-        public Optional<int> Flags { get; set; }
+        public Optional<ActivityFlag> Flags { get; set; }
 
         [OnError]
         internal void OnError(StreamingContext context, ErrorContext errorContext)
diff --git a/src/Discord.Net.Rest/API/Common/User.cs b/src/Discord.Net.Rest/API/Common/User.cs
index e1a5d2915..c7b7de81c 100644
--- a/src/Discord.Net.Rest/API/Common/User.cs
+++ b/src/Discord.Net.Rest/API/Common/User.cs
@@ -24,7 +24,7 @@ namespace Discord.API
         [JsonProperty("mfa_enabled")]
         public Optional<bool> MfaEnabled { get; set; }
         [JsonProperty("flags")]
-        public Optional<int> Flags { get; set; }
+        public Optional<UserFlag> Flags { get; set; }
         [JsonProperty("premium_type")]
         public Optional<PremiumType> PremiumType { get; set; }
         [JsonProperty("locale")]
diff --git a/src/Discord.Net.Rest/Entities/Users/RestUser.cs b/src/Discord.Net.Rest/Entities/Users/RestUser.cs
index 7d9f8a4b7..3e93d3cf4 100644
--- a/src/Discord.Net.Rest/Entities/Users/RestUser.cs
+++ b/src/Discord.Net.Rest/Entities/Users/RestUser.cs
@@ -33,7 +33,7 @@ namespace Discord.Rest
         /// <inheritdoc />
         public virtual bool IsWebhook => false;
         /// <inheritdoc />
-        public int Flags { get; private set; }
+        public UserFlag Flags { get; private set; }
         /// <inheritdoc />
         public PremiumType? PremiumType { get; private set; }
         /// <inheritdoc />
diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
index be64c2db0..d9d5bfd1f 100644
--- a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
+++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
@@ -39,7 +39,7 @@ namespace Discord.WebSocket
         /// <inheritdoc />
         public UserStatus Status => Presence.Status;
         /// <inheritdoc />
-        public int Flags { get; internal set; }
+        public UserFlag Flags { get; internal set; }
         /// <inheritdoc />
         public PremiumType? PremiumType { get; internal set; }
         /// <inheritdoc />