From 88211ddb75d491641ef4438c9d91d8220f0cb450 Mon Sep 17 00:00:00 2001
From: Jared Goodwin <jared.goodwin@immy.bot>
Date: Fri, 12 May 2023 10:34:31 -0700
Subject: [PATCH] Remove more redundant code.  Remove frame received messages
 (no longer needed with streaming).

---
 Shared/Enums/BaseDtoType.cs                   | 57 -------------------
 .../RemoteControlDtos/AudioSampleDto.cs       | 22 -------
 Shared/Models/RemoteControlDtos/BaseDto.cs    | 12 ----
 .../RemoteControlDtos/CaptureFrameDto.cs      | 32 -----------
 .../RemoteControlDtos/ClipboardTextDto.cs     | 21 -------
 .../RemoteControlDtos/ClipboardTransferDto.cs | 20 -------
 .../RemoteControlDtos/CursorChangeDto.cs      | 32 -----------
 Shared/Models/RemoteControlDtos/FileDto.cs    | 28 ---------
 Shared/Models/RemoteControlDtos/KeyDownDto.cs | 15 -----
 .../Models/RemoteControlDtos/KeyPressDto.cs   | 15 -----
 Shared/Models/RemoteControlDtos/KeyUpDto.cs   | 15 -----
 .../Models/RemoteControlDtos/MouseDownDto.cs  | 21 -------
 .../Models/RemoteControlDtos/MouseMoveDto.cs  | 19 -------
 Shared/Models/RemoteControlDtos/MouseUpDto.cs | 21 -------
 .../Models/RemoteControlDtos/MouseWheelDto.cs | 19 -------
 .../Models/RemoteControlDtos/ScreenDataDto.cs | 29 ----------
 .../Models/RemoteControlDtos/ScreenSizeDto.cs | 24 --------
 .../RemoteControlDtos/SelectScreenDto.cs      | 15 -----
 Shared/Models/RemoteControlDtos/TapDto.cs     | 19 -------
 .../RemoteControlDtos/ToggleAudioDto.cs       | 15 -----
 .../RemoteControlDtos/ToggleBlockInputDto.cs  | 15 -----
 .../RemoteControlDtos/WindowsSessionsDto.cs   | 24 --------
 submodules/Immense.RemoteControl              |  2 +-
 23 files changed, 1 insertion(+), 491 deletions(-)
 delete mode 100644 Shared/Enums/BaseDtoType.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/AudioSampleDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/BaseDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/CaptureFrameDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/ClipboardTextDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/CursorChangeDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/FileDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/KeyDownDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/KeyPressDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/KeyUpDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/MouseDownDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/MouseMoveDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/MouseUpDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/MouseWheelDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/ScreenDataDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/ScreenSizeDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/SelectScreenDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/TapDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/ToggleAudioDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs
 delete mode 100644 Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs

diff --git a/Shared/Enums/BaseDtoType.cs b/Shared/Enums/BaseDtoType.cs
deleted file mode 100644
index 8c0117968..000000000
--- a/Shared/Enums/BaseDtoType.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Enums
-{
-    [DataContract]
-    public enum BaseDtoType
-    {
-        [EnumMember(Value = "CaptureFrame")]
-        CaptureFrame = 0,
-        [EnumMember(Value = "ScreenData")]
-        ScreenData = 1,
-        [EnumMember(Value = "ScreenSize")]
-        ScreenSize = 2,
-        [EnumMember(Value = "ClipboardText")]
-        ClipboardText = 4,
-        [EnumMember(Value = "AudioSample")]
-        AudioSample = 5,
-        [EnumMember(Value = "CursorChange")]
-        CursorChange = 6,
-        [EnumMember(Value = "SelectScreen")]
-        SelectScreen = 7,
-        [EnumMember(Value = "MouseMove")]
-        MouseMove = 8,
-        [EnumMember(Value = "MouseDown")]
-        MouseDown = 9,
-        [EnumMember(Value = "MouseUp")]
-        MouseUp = 10,
-        [EnumMember(Value = "Tap")]
-        Tap = 11,
-        [EnumMember(Value = "MouseWheel")]
-        MouseWheel = 12,
-        [EnumMember(Value = "KeyDown")]
-        KeyDown = 13,
-        [EnumMember(Value = "KeyUp")]
-        KeyUp = 14,
-        [EnumMember(Value = "CtrlAltDel")]
-        CtrlAltDel = 15,
-        [EnumMember(Value = "ToggleAudio")]
-        ToggleAudio = 17,
-        [EnumMember(Value = "ToggleBlockInput")]
-        ToggleBlockInput = 18,
-        [EnumMember(Value = "ClipboardTransfer")]
-        ClipboardTransfer = 19,
-        [EnumMember(Value = "KeyPress")]
-        KeyPress = 20,
-        [EnumMember(Value = "File")]
-        File = 22,
-        [EnumMember(Value = "WindowsSessions")]
-        WindowsSessions = 23,
-        [EnumMember(Value = "SetKeyStatesUp")]
-        SetKeyStatesUp = 24,
-        [EnumMember(Value = "FrameReceived")]
-        FrameReceived = 25,
-        [EnumMember(Value = "OpenFileTransferWindow")]
-        OpenFileTransferWindow = 27
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/AudioSampleDto.cs b/Shared/Models/RemoteControlDtos/AudioSampleDto.cs
deleted file mode 100644
index 57301378b..000000000
--- a/Shared/Models/RemoteControlDtos/AudioSampleDto.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class AudioSampleDto : BaseDto
-    {
-        public AudioSampleDto(byte[] buffer)
-        {
-            Buffer = buffer;
-        }
-
-        [DataMember(Name = "Buffer")]
-        public byte[] Buffer { get; }
-
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.AudioSample;
-
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/BaseDto.cs b/Shared/Models/RemoteControlDtos/BaseDto.cs
deleted file mode 100644
index c8f25133c..000000000
--- a/Shared/Models/RemoteControlDtos/BaseDto.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class BaseDto
-    {
-        [DataMember(Name = "DtoType")]
-        public virtual BaseDtoType DtoType { get; init; }
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs b/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs
deleted file mode 100644
index 003160d05..000000000
--- a/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Remotely.Shared.Enums;
-using System;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class CaptureFrameDto : BaseDto
-    {
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.CaptureFrame;
-
-        [DataMember(Name = "EndOfFrame")]
-        public bool EndOfFrame { get; init; }
-
-        [DataMember(Name = "Height")]
-        public int Height { get; init; }
-
-        [DataMember(Name = "ImageBytes")]
-        public byte[] ImageBytes { get; init; }
-
-        [DataMember(Name = "Left")]
-        public int Left { get; init; }
-        [DataMember(Name = "Top")]
-        public int Top { get; init; }
-        [DataMember(Name = "Width")]
-        public int Width { get; init; }
-
-        [DataMember(Name = "Sequence")]
-        public long Sequence { get; init; }
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs b/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs
deleted file mode 100644
index 6fa4743d5..000000000
--- a/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class ClipboardTextDto : BaseDto
-    {
-        public ClipboardTextDto(string clipboardText)
-        {
-            ClipboardText = clipboardText;
-        }
-
-        [DataMember(Name = "ClipboardText")]
-        public string ClipboardText { get; }
-
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.ClipboardText;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs b/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs
deleted file mode 100644
index 05981b8f5..000000000
--- a/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class ClipboardTransferDto : BaseDto
-    {
-
-        [DataMember(Name = "Text")]
-        public string Text { get; set; }
-
-        [DataMember(Name = "TypeText")]
-        public bool TypeText { get; set; }
-
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.ClipboardTransfer;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/CursorChangeDto.cs b/Shared/Models/RemoteControlDtos/CursorChangeDto.cs
deleted file mode 100644
index df66c95fa..000000000
--- a/Shared/Models/RemoteControlDtos/CursorChangeDto.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class CursorChangeDto : BaseDto
-    {
-        public CursorChangeDto(byte[] imageBytes, int hotSpotX, int hotSpotY, string cssOverride)
-        {
-            ImageBytes = imageBytes;
-            HotSpotX = hotSpotX;
-            HotSpotY = hotSpotY;
-            CssOverride = cssOverride;
-        }
-
-        [DataMember(Name = "CssOverride")]
-        public string CssOverride { get; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.CursorChange;
-
-        [DataMember(Name = "HotSpotX")]
-        public int HotSpotX { get; }
-
-        [DataMember(Name = "HotSpotY")]
-        public int HotSpotY { get; }
-
-        [DataMember(Name = "ImageBytes")]
-        public byte[] ImageBytes { get; }
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/FileDto.cs b/Shared/Models/RemoteControlDtos/FileDto.cs
deleted file mode 100644
index e3ba4c284..000000000
--- a/Shared/Models/RemoteControlDtos/FileDto.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-
-    [DataContract]
-    public class FileDto : BaseDto
-    {
-        [DataMember(Name = "Buffer")]
-        public byte[] Buffer { get; set; }
-
-        [DataMember(Name = "FileName")]
-        public string FileName { get; set; }
-
-        [DataMember(Name = "MessageId")]
-        public string MessageId { get; set; }
-
-        [DataMember(Name = "EndOfFile")]
-        public bool EndOfFile { get; set; }
-
-        [DataMember(Name = "StartOfFile")]
-        public bool StartOfFile { get; set; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.File;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/KeyDownDto.cs b/Shared/Models/RemoteControlDtos/KeyDownDto.cs
deleted file mode 100644
index 660ff705d..000000000
--- a/Shared/Models/RemoteControlDtos/KeyDownDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class KeyDownDto : BaseDto
-    {
-        [DataMember(Name = "Key")]
-        public string Key { get; set; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.KeyDown;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/KeyPressDto.cs b/Shared/Models/RemoteControlDtos/KeyPressDto.cs
deleted file mode 100644
index e44cb1b1b..000000000
--- a/Shared/Models/RemoteControlDtos/KeyPressDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class KeyPressDto : BaseDto
-    {
-        [DataMember(Name = "Key")]
-        public string Key { get; set; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.KeyPress;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/KeyUpDto.cs b/Shared/Models/RemoteControlDtos/KeyUpDto.cs
deleted file mode 100644
index c2dd48c2a..000000000
--- a/Shared/Models/RemoteControlDtos/KeyUpDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class KeyUpDto : BaseDto
-    {
-        [DataMember(Name = "Key")]
-        public string Key { get; set; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.KeyUp;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/MouseDownDto.cs b/Shared/Models/RemoteControlDtos/MouseDownDto.cs
deleted file mode 100644
index 913416980..000000000
--- a/Shared/Models/RemoteControlDtos/MouseDownDto.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class MouseDownDto : BaseDto
-    {
-        [DataMember(Name = "Button")]
-        public int Button { get; set; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseDown;
-
-        [DataMember(Name = "PercentX")]
-        public double PercentX { get; set; }
-
-        [DataMember(Name = "PercentY")]
-        public double PercentY { get; set; }
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/MouseMoveDto.cs b/Shared/Models/RemoteControlDtos/MouseMoveDto.cs
deleted file mode 100644
index 8c983c31a..000000000
--- a/Shared/Models/RemoteControlDtos/MouseMoveDto.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class MouseMoveDto : BaseDto
-    {
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseMove;
-
-        [DataMember(Name = "PercentX")]
-        public double PercentX { get; set; }
-
-        [DataMember(Name = "PercentY")]
-        public double PercentY { get; set; }
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/MouseUpDto.cs b/Shared/Models/RemoteControlDtos/MouseUpDto.cs
deleted file mode 100644
index 559567574..000000000
--- a/Shared/Models/RemoteControlDtos/MouseUpDto.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class MouseUpDto : BaseDto
-    {
-        [DataMember(Name = "Button")]
-        public int Button { get; set; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseUp;
-
-        [DataMember(Name = "PercentX")]
-        public double PercentX { get; set; }
-
-        [DataMember(Name = "PercentY")]
-        public double PercentY { get; set; }
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/MouseWheelDto.cs b/Shared/Models/RemoteControlDtos/MouseWheelDto.cs
deleted file mode 100644
index e32fa71d3..000000000
--- a/Shared/Models/RemoteControlDtos/MouseWheelDto.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class MouseWheelDto : BaseDto
-    {
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseWheel;
-
-        [DataMember(Name = "DeltaX")]
-        public double DeltaX { get; set; }
-
-        [DataMember(Name = "DeltaY")]
-        public double DeltaY { get; set; }
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/ScreenDataDto.cs b/Shared/Models/RemoteControlDtos/ScreenDataDto.cs
deleted file mode 100644
index 070ddd0da..000000000
--- a/Shared/Models/RemoteControlDtos/ScreenDataDto.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class ScreenDataDto : BaseDto
-    {
-        [DataMember(Name = "DisplayNames")]
-        public IEnumerable<string> DisplayNames { get; init; }
-
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.ScreenData;
-
-        [DataMember(Name = "SelectedDisplay")]
-        public string SelectedDisplay { get; init; }
-
-        [DataMember(Name = "MachineName")]
-        public string MachineName { get; init; }
-
-        [DataMember(Name = "ScreenWidth")]
-        public int ScreenWidth { get; init; }
-
-        [DataMember(Name = "ScreenHeight")]
-        public int ScreenHeight { get; init; }
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs b/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs
deleted file mode 100644
index 951694f40..000000000
--- a/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class ScreenSizeDto : BaseDto
-    {
-        public ScreenSizeDto(int width, int height)
-        {
-            Width = width;
-            Height = height;
-        }
-
-        [DataMember(Name = "Width")]
-        public int Width { get; }
-
-        [DataMember(Name = "Height")]
-        public int Height { get; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.ScreenSize;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/SelectScreenDto.cs b/Shared/Models/RemoteControlDtos/SelectScreenDto.cs
deleted file mode 100644
index 1860da323..000000000
--- a/Shared/Models/RemoteControlDtos/SelectScreenDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class SelectScreenDto : BaseDto
-    {
-        [DataMember(Name = "DisplayName")]
-        public string DisplayName { get; set; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.SelectScreen;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/TapDto.cs b/Shared/Models/RemoteControlDtos/TapDto.cs
deleted file mode 100644
index 9bb469412..000000000
--- a/Shared/Models/RemoteControlDtos/TapDto.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class TapDto : BaseDto
-    {
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.Tap;
-
-        [DataMember(Name = "PercentX")]
-        public double PercentX { get; set; }
-
-        [DataMember(Name = "PercentY")]
-        public double PercentY { get; set; }
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs b/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs
deleted file mode 100644
index 38759ad7e..000000000
--- a/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class ToggleAudioDto : BaseDto
-    {
-        [DataMember(Name = "ToggleOn")]
-        public bool ToggleOn { get; set; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.ToggleAudio;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs b/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs
deleted file mode 100644
index 6fb7550ae..000000000
--- a/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Remotely.Shared.Enums;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class ToggleBlockInputDto : BaseDto
-    {
-        [DataMember(Name = "ToggleOn")]
-        public bool ToggleOn { get; set; }
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.ToggleBlockInput;
-    }
-}
diff --git a/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs b/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs
deleted file mode 100644
index 7ca772243..000000000
--- a/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Immense.RemoteControl.Desktop.Native.DataStructures;
-using Remotely.Shared.Enums;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-
-namespace Remotely.Shared.Models.RemoteControlDtos
-{
-    [DataContract]
-    public class WindowsSessionsDto : BaseDto
-    {
-        public WindowsSessionsDto(List<WindowsSession> windowsSessions)
-        {
-            WindowsSessions = windowsSessions;
-        }
-
-
-        [DataMember(Name = "WindowsSessions")]
-        public List<WindowsSession> WindowsSessions { get; set; }
-
-
-        [DataMember(Name = "DtoType")]
-        public override BaseDtoType DtoType { get; init; } = BaseDtoType.WindowsSessions;
-    }
-}
diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl
index d75325764..58495c96e 160000
--- a/submodules/Immense.RemoteControl
+++ b/submodules/Immense.RemoteControl
@@ -1 +1 @@
-Subproject commit d7532576486353f6b87dca6448b0e723a90adfa5
+Subproject commit 58495c96edede252d1ae8678300c3c6dc9625c2b