diff --git a/Dalamud/Game/Internal/Framework.cs b/Dalamud/Game/Internal/Framework.cs
index abe3272e0..adef8e3c8 100644
--- a/Dalamud/Game/Internal/Framework.cs
+++ b/Dalamud/Game/Internal/Framework.cs
@@ -6,8 +6,8 @@ using System.Runtime.InteropServices;
 using System.Threading;
 
 using Dalamud.Game.Internal.Gui;
-using Dalamud.Game.Internal.Libc;
 using Dalamud.Game.Internal.Network;
+using Dalamud.Game.Libc;
 using Dalamud.Hooking;
 using Serilog;
 
diff --git a/Dalamud/Game/Internal/Gui/ChatGui.cs b/Dalamud/Game/Internal/Gui/ChatGui.cs
index 09aa234eb..9b60b8b46 100644
--- a/Dalamud/Game/Internal/Gui/ChatGui.cs
+++ b/Dalamud/Game/Internal/Gui/ChatGui.cs
@@ -2,9 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 
-using Dalamud.Game.Internal.Libc;
+using Dalamud.Game.Libc;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
@@ -60,17 +59,6 @@ namespace Dalamud.Game.Internal.Gui
         /// <param name="isHandled">A value indicating whether the message was handled or should be propagated.</param>
         public delegate void OnMessageDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
 
-        /// <summary>
-        /// A delegate type used with the <see cref="OnChatMessageRaw"/> event.
-        /// </summary>
-        /// <param name="type">The type of chat.</param>
-        /// <param name="senderId">The sender ID.</param>
-        /// <param name="sender">The sender name.</param>
-        /// <param name="message">The message sent.</param>
-        /// <param name="isHandled">A value indicating whether the message was handled or should be propagated.</param>
-        [Obsolete("Please use OnMessageDelegate instead. For modifications, it will take precedence.")]
-        public delegate void OnMessageRawDelegate(XivChatType type, uint senderId, ref StdString sender, ref StdString message, ref bool isHandled);
-
         /// <summary>
         /// A delegate type used with the <see cref="OnCheckMessageHandled"/> event.
         /// </summary>
@@ -113,12 +101,6 @@ namespace Dalamud.Game.Internal.Gui
         /// </summary>
         public event OnMessageDelegate OnChatMessage;
 
-        /// <summary>
-        /// Event that will be fired when a chat message is sent by the game, containing raw, unparsed data.
-        /// </summary>
-        [Obsolete("Please use OnChatMessage instead. For modifications, it will take precedence.")]
-        public event OnMessageRawDelegate OnChatMessageRaw;
-
         /// <summary>
         /// Event that allows you to stop messages from appearing in chat by setting the isHandled parameter to true.
         /// </summary>
@@ -388,7 +370,6 @@ namespace Dalamud.Game.Internal.Gui
                 if (!isHandled)
                 {
                     this.OnChatMessage?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
-                    this.OnChatMessageRaw?.Invoke(chattype, senderid, ref sender, ref message, ref isHandled);
                 }
 
                 var newEdited = parsedMessage.Encode();
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs
index e526d9c70..04bcd1029 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs
@@ -19,17 +19,6 @@ namespace Dalamud.Game.Text.SeStringHandling.Payloads
             this.Icon = icon;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IconPayload"/> class.
-        /// Create a Icon payload for the specified icon.
-        /// </summary>
-        /// <param name="iconIndex">Index of the icon.</param>
-        [Obsolete("IconPayload(uint) is deprecated, please use IconPayload(BitmapFontIcon).")]
-        public IconPayload(uint iconIndex)
-            : this((BitmapFontIcon)iconIndex)
-        {
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="IconPayload"/> class.
         /// Create a Icon payload for the specified icon.
@@ -41,12 +30,6 @@ namespace Dalamud.Game.Text.SeStringHandling.Payloads
         /// <inheritdoc/>
         public override PayloadType Type => PayloadType.Icon;
 
-        /// <summary>
-        /// Gets the index of the icon.
-        /// </summary>
-        [Obsolete("Use IconPayload.Icon")]
-        public uint IconIndex => (uint)this.Icon;
-
         /// <summary>
         /// Gets or sets the icon the payload represents.
         /// </summary>
diff --git a/Dalamud/Interface/Internal/Windows/DataWindow.cs b/Dalamud/Interface/Internal/Windows/DataWindow.cs
index 23f869f9d..391520a0b 100644
--- a/Dalamud/Interface/Internal/Windows/DataWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/DataWindow.cs
@@ -4,11 +4,11 @@ using System.Dynamic;
 using System.Linq;
 using System.Numerics;
 
+using Dalamud.Game;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.ClientState.Actors.Types;
 using Dalamud.Game.ClientState.Actors.Types.NonPlayer;
 using Dalamud.Game.ClientState.Structs.JobGauge;
-using Dalamud.Game.Internal;
 using Dalamud.Game.Internal.Gui.Addon;
 using Dalamud.Game.Internal.Gui.Toast;
 using Dalamud.Game.Text;
diff --git a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
index dc18ce73c..733baa454 100644
--- a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Reflection;
 
 using Dalamud.Game;
+using Dalamud.Game.Internal;
 using Dalamud.Hooking.Internal;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin.Internal;