diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/InitiateUserAccountPairingCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/InitiateUserAccountPairingCommand.cs
index b4ad1358ca..405c9a9832 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/InitiateUserAccountPairingCommand.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/InitiateUserAccountPairingCommand.cs
@@ -9,7 +9,7 @@ namespace UnityEngine.InputSystem.LowLevel
     /// <remarks>
     ///
     /// If successful, the platform should then send an <see cref="DeviceConfigurationEvent"/>
-    /// to signal that the device configuration has been changed. In response, a <see cref="QueryUserIdCommand"/>
+    /// to signal that the device configuration has been changed. In response, a <see cref="QueryPairedUserAccountCommand"/>
     /// may be sent to fetch the paired user ID from the device.
     /// </remarks>
     [StructLayout(LayoutKind.Explicit, Size = kSize)]
diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs
deleted file mode 100644
index 1e6a2dc814..0000000000
--- a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using UnityEngine.InputSystem.Utilities;
-
-////TODO: remove this one; superseded by QueryPairedUserAccountCommand
-
-namespace UnityEngine.InputSystem.LowLevel
-{
-    [StructLayout(LayoutKind.Explicit, Size = kSize)]
-    internal unsafe struct QueryUserIdCommand : IInputDeviceCommandInfo
-    {
-        public static FourCC Type { get { return new FourCC('U', 'S', 'E', 'R'); } }
-
-        public const int kMaxIdLength = 256;
-        internal const int kSize = InputDeviceCommand.kBaseCommandSize + kMaxIdLength * 2;
-
-        [FieldOffset(0)]
-        public InputDeviceCommand baseCommand;
-
-        [FieldOffset(InputDeviceCommand.kBaseCommandSize)]
-        public fixed byte idBuffer[kMaxIdLength * 2];
-
-        public string ReadId()
-        {
-            fixed(QueryUserIdCommand * thisPtr = &this)
-            {
-                return StringHelpers.ReadStringFromBuffer(new IntPtr(thisPtr->idBuffer), kMaxIdLength);
-            }
-        }
-
-        public FourCC typeStatic
-        {
-            get { return Type; }
-        }
-
-        public static QueryUserIdCommand Create()
-        {
-            return new QueryUserIdCommand
-            {
-                baseCommand = new InputDeviceCommand(Type, kSize),
-            };
-        }
-    }
-}
diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs.meta
deleted file mode 100644
index 08b1b4f263..0000000000
--- a/Packages/com.unity.inputsystem/InputSystem/Devices/Commands/QueryUserIdCommand.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6c784a1510a154625903484b84c8ddaf
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: