diff --git a/src/LibRyujinx/LibRyujinx.cs b/src/LibRyujinx/LibRyujinx.cs
index 6e832e06a..495613573 100644
--- a/src/LibRyujinx/LibRyujinx.cs
+++ b/src/LibRyujinx/LibRyujinx.cs
@@ -26,6 +26,7 @@ using LibHac.FsSystem;
 using LibHac.Fs;
 using Path = System.IO.Path;
 using LibHac;
+using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.HLE.Loaders.Npdm;
 using Ryujinx.Common.Utilities;
 using System.Globalization;
@@ -709,7 +710,8 @@ namespace LibRyujinx
                                                                    LibRyujinx.GraphicsConfiguration.AspectRatio,
                                                                   100,
                                                                   useNce,
-                                                                  "");
+                                                                  "",
+                                                                  MultiplayerMode.Disabled);
 
             EmulationContext = new Switch(configuration);
 
diff --git a/src/LibRyujinx/rd.xml b/src/LibRyujinx/rd.xml
index 15d355609..220da644e 100644
--- a/src/LibRyujinx/rd.xml
+++ b/src/LibRyujinx/rd.xml
@@ -91,16 +91,12 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Fatal.IService"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Ins.IReceiverManager"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.SurfaceFlinger.ConsumerBase"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Time.StaticService.ISteadyClock"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Am.AppletAE.IStorage"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Psc.IPmService"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Hid.HidServer.IAppletResource"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Nifm.StaticService.IGeneralService"
@@ -115,8 +111,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Nfc.Nfp.AmiiboJsonSerializerContext"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Usb.IPdManager"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager.MultiSampleDecoder"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Time.Clock.StandardLocalSystemClockCore"
@@ -155,8 +149,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Audio.IAudioRendererManagerForApplet"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Usb.IUnknown2"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Arp.IReader"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Time.Clock.StandardNetworkSystemClockCore"
@@ -181,10 +173,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Fs.IDeviceOperator"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Usb.IPdCradleManager"
-                  Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Lbl.LblControllerServer"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Audio.IAudioOutManagerForApplet"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.ISystemAppletProxy"
@@ -245,8 +233,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Audio.AudioOut.AudioOut"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Wlan.ISocketManager"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager.ILocationResolver"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Mii.IStaticService"
@@ -279,8 +265,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Am.Tcap.IAvmService"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Srepo.ISrepoService"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.BluetoothManager.IBtmUser"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Pcie.IManager"
@@ -333,18 +317,10 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Pcv.Bpc.IBoardPowerControlManager"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Ins.ISenderManager"
-                  Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Wlan.ILocalGetFrame"
-                  Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Wlan.IUnknown1"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Ldn.IUserServiceCreator"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Spl.IRandomInterface"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Usb.IPmService"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Sdb.Pdm.IQueryService"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Ptm.Pcm.IManager"
@@ -353,8 +329,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.SurfaceFlinger.HOSBinderDriverServer"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Wlan.ILocalManager"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Ncm.IContentManager"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Vi.ISystemRootService"
@@ -369,8 +343,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Ns.IVulnerabilityManagerInterface"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Wlan.IInfraManager"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Caps.IAlbumApplicationService"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Am.Tcap.IManager"
@@ -429,8 +401,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Ns.ISystemUpdateInterface"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Ovln.IReceiverService"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Nfc.ISystemManager"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Pcv.IPcvService"
@@ -447,8 +417,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.SurfaceFlinger.BufferItemConsumer"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Wlan.ISocketGetFrame"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl.NvHostCtrlDeviceFile"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory.IParentalControlService"
@@ -505,8 +473,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Audio.IFinalOutputRecorderManager"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Psc.IPmControl"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostChannel.NvHostChannelDeviceFile"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy.IStorage"
@@ -521,8 +487,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Audio.AudioIn.AudioInServer"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Psc.IPmUnknown"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Vi.RootService.IApplicationDisplayService"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Loader.IDebugMonitorInterface"
@@ -539,8 +503,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Time.StaticService.ITimeZoneServiceForGlue"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Wlan.ILocalGetActionFrame"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Notification.INotificationServicesForSystem"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Am.Spsm.IPowerStateInterface"
@@ -575,22 +537,16 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Pm.IBootModeInterface"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Ovln.ISenderService"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Npns.INpnsUser"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Olsc.IOlscServiceForSystemService"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Audio.AudioRenderer.AudioRenderer"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Usb.IDsService"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService.IManagerDisplayService"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Ptm.Tc.IManager"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Usb.IUnknown1"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Ectx.IReaderForSystem"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Loader.IProcessManagerInterface"
@@ -613,8 +569,6 @@
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Vi.IApplicationRootService"
                   Dynamic="Required All" />
-            <Type Name="Ryujinx.HLE.HOS.Services.Usb.IClientRootSession"
-                  Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.Audio.AudioOut.AudioOutServer"
                   Dynamic="Required All" />
             <Type Name="Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser.IBtmUserCore"
diff --git a/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs b/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
index 783e7113f..08e38be35 100644
--- a/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
+++ b/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
@@ -211,8 +211,7 @@ namespace Ryujinx.Graphics.Vulkan
                     if (currentUsage.Binding + currentCount != usage.Binding ||
                         currentUsage.Type != usage.Type ||
                         (IsReadOnlyTexture(currentUsage.Type) && hasBatchedTextureBug) ||
-                        currentUsage.Stages != usage.Stages ||
-                        currentUsage.Access != usage.Access)
+                        currentUsage.Stages != usage.Stages)
                     {
                         if (currentCount != 0)
                         {