3 files changed, 4 insertions, 26 deletions
diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs
index 590dc5eb3..a588ce029 100644
--- a/MediaBrowser.Model/Devices/DeviceInfo.cs
+++ b/MediaBrowser.Model/Devices/DeviceInfo.cs
@@ -5,22 +5,6 @@ namespace MediaBrowser.Model.Devices
 {
     public class DeviceInfo
     {
-        /// <summary>
-        /// Gets or sets the name of the reported.
-        /// </summary>
-        /// <value>The name of the reported.</value>
-        public string ReportedName { get; set; }
-        /// <summary>
-        /// Gets or sets the name of the custom.
-        /// </summary>
-        /// <value>The name of the custom.</value>
-        public string CustomName { get; set; }
-        /// <summary>
-        /// Gets or sets the camera upload path.
-        /// </summary>
-        /// <value>The camera upload path.</value>
-        public string CameraUploadPath { get; set; }
-
         public string Name { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Model/Devices/DeviceQuery.cs b/MediaBrowser.Model/Devices/DeviceQuery.cs
index 9ceea1ea8..2838239e4 100644
--- a/MediaBrowser.Model/Devices/DeviceQuery.cs
+++ b/MediaBrowser.Model/Devices/DeviceQuery.cs
@@ -1,14 +1,11 @@
 
+using System;
+
 namespace MediaBrowser.Model.Devices
 {
     public class DeviceQuery
     {
         /// <summary>
-        /// Gets or sets a value indicating whether [supports unique identifier].
-        /// </summary>
-        /// <value><c>null</c> if [supports unique identifier] contains no value, <c>true</c> if [supports unique identifier]; otherwise, <c>false</c>.</value>
-        public bool? SupportsPersistentIdentifier { get; set; }
-        /// <summary>
         /// Gets or sets a value indicating whether [supports synchronize].
         /// </summary>
         /// <value><c>null</c> if [supports synchronize] contains no value, <c>true</c> if [supports synchronize]; otherwise, <c>false</c>.</value>
@@ -17,6 +14,6 @@ namespace MediaBrowser.Model.Devices
         /// Gets or sets the user identifier.
         /// </summary>
         /// <value>The user identifier.</value>
-        public string UserId { get; set; }
+        public Guid UserId { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Devices/DevicesOptions.cs b/MediaBrowser.Model/Devices/DevicesOptions.cs
index 5bcdd1a82..8e478d005 100644
--- a/MediaBrowser.Model/Devices/DevicesOptions.cs
+++ b/MediaBrowser.Model/Devices/DevicesOptions.cs
@@ -10,15 +10,12 @@ namespace MediaBrowser.Model.Devices
 
         public DevicesOptions()
         {
-            EnabledCameraUploadDevices = new string[] {};
+            EnabledCameraUploadDevices = Array.Empty<string>();
         }
     }
 
     public class DeviceOptions
     {
-        public string[] EnabledCameraUploadDevices { get; set; }
-        public string CameraUploadPath { get; set; }
-        public bool EnableCameraUploadSubfolders { get; set; }
         public string CustomName { get; set; }
     }
 }