14 files changed, 13 insertions, 60 deletions
diff --git a/MediaBrowser.Model/Services/ApiMemberAttribute.cs b/MediaBrowser.Model/Services/ApiMemberAttribute.cs
index 9e5faad29..8b155c8ab 100644
--- a/MediaBrowser.Model/Services/ApiMemberAttribute.cs
+++ b/MediaBrowser.Model/Services/ApiMemberAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/HttpUtility.cs b/MediaBrowser.Model/Services/HttpUtility.cs
index 1bf3b28d1..be180334c 100644
--- a/MediaBrowser.Model/Services/HttpUtility.cs
+++ b/MediaBrowser.Model/Services/HttpUtility.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
@@ -445,8 +445,8 @@ namespace MediaBrowser.Model.Services
             if (s.IndexOf('&') == -1)
                 return s;
 
-            StringBuilder entity = new StringBuilder();
-            StringBuilder output = new StringBuilder();
+            var entity = new StringBuilder();
+            var output = new StringBuilder();
             int len = s.Length;
             // 0 -> nothing,
             // 1 -> right after '&'
@@ -623,7 +623,7 @@ namespace MediaBrowser.Model.Services
             if (query[0] == '?')
                 query = query.Substring(1);
 
-            QueryParamCollection result = new QueryParamCollection();
+            var result = new QueryParamCollection();
             ParseQueryString(query, encoding, result);
             return result;
         }
diff --git a/MediaBrowser.Model/Services/IAsyncStreamWriter.cs b/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
index b10e12813..f16a877e6 100644
--- a/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
+++ b/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Model/Services/IHasHeaders.cs b/MediaBrowser.Model/Services/IHasHeaders.cs
index 35e652b0f..b2d413b70 100644
--- a/MediaBrowser.Model/Services/IHasHeaders.cs
+++ b/MediaBrowser.Model/Services/IHasHeaders.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IHasRequestFilter.cs b/MediaBrowser.Model/Services/IHasRequestFilter.cs
index 90cfc2a31..d4e6aa8e0 100644
--- a/MediaBrowser.Model/Services/IHasRequestFilter.cs
+++ b/MediaBrowser.Model/Services/IHasRequestFilter.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Services
 {
     public interface IHasRequestFilter
diff --git a/MediaBrowser.Model/Services/IHttpRequest.cs b/MediaBrowser.Model/Services/IHttpRequest.cs
index e1480f30a..579f80c96 100644
--- a/MediaBrowser.Model/Services/IHttpRequest.cs
+++ b/MediaBrowser.Model/Services/IHttpRequest.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace MediaBrowser.Model.Services
 {
     public interface IHttpRequest : IRequest
diff --git a/MediaBrowser.Model/Services/IHttpResponse.cs b/MediaBrowser.Model/Services/IHttpResponse.cs
index 9d77eefc9..a8b79f394 100644
--- a/MediaBrowser.Model/Services/IHttpResponse.cs
+++ b/MediaBrowser.Model/Services/IHttpResponse.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IHttpResult.cs b/MediaBrowser.Model/Services/IHttpResult.cs
index b912ef023..bfa30f60d 100644
--- a/MediaBrowser.Model/Services/IHttpResult.cs
+++ b/MediaBrowser.Model/Services/IHttpResult.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
index 681bab294..ac9b981b9 100644
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
diff --git a/MediaBrowser.Model/Services/IRequiresRequestStream.cs b/MediaBrowser.Model/Services/IRequiresRequestStream.cs
index 0b8ac3ed3..2f17c6a9a 100644
--- a/MediaBrowser.Model/Services/IRequiresRequestStream.cs
+++ b/MediaBrowser.Model/Services/IRequiresRequestStream.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IService.cs b/MediaBrowser.Model/Services/IService.cs
index 3e0ff280b..8f2e63e98 100644
--- a/MediaBrowser.Model/Services/IService.cs
+++ b/MediaBrowser.Model/Services/IService.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Services
 {
     // marker interface
diff --git a/MediaBrowser.Model/Services/IStreamWriter.cs b/MediaBrowser.Model/Services/IStreamWriter.cs
index 1fc11049e..9d65cff63 100644
--- a/MediaBrowser.Model/Services/IStreamWriter.cs
+++ b/MediaBrowser.Model/Services/IStreamWriter.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/QueryParamCollection.cs b/MediaBrowser.Model/Services/QueryParamCollection.cs
index 05ba6f18d..4297b97c6 100644
--- a/MediaBrowser.Model/Services/QueryParamCollection.cs
+++ b/MediaBrowser.Model/Services/QueryParamCollection.cs
@@ -177,40 +177,8 @@ namespace MediaBrowser.Model.Services
         /// <returns>The query parameter value or array of values</returns>
         public string this[string name]
         {
-            get { return Get(name); }
-            set
-            {
-                Set(name, value);
-                //var parameters = this.Where(p => p.Name == name).ToArray();
-                //var values = new[] { value };
-
-                //for (int i = 0; ; i++)
-                //{
-                //    if (i < parameters.Length && i < values.Length)
-                //    {
-                //        if (values[i] == null)
-                //            Remove(parameters[i]);
-                //        else if (values[i] is NameValuePair)
-                //            this[IndexOf(parameters[i])] = (NameValuePair)values[i];
-                //        else
-                //            parameters[i].Value = values[i];
-                //    }
-                //    else if (i < parameters.Length)
-                //        Remove(parameters[i]);
-                //    else if (i < values.Length)
-                //    {
-                //        if (values[i] != null)
-                //        {
-                //            if (values[i] is NameValuePair)
-                //                Add((NameValuePair)values[i]);
-                //            else
-                //                Add(name, values[i]);
-                //        }
-                //    }
-                //    else
-                //        break;
-                //}
-            }
+            get => Get(name);
+            set => Set(name, value);
         }
 
         private string GetQueryStringValue(NameValuePair pair)
diff --git a/MediaBrowser.Model/Services/RouteAttribute.cs b/MediaBrowser.Model/Services/RouteAttribute.cs
index 0dc52af7b..f6316e2b1 100644
--- a/MediaBrowser.Model/Services/RouteAttribute.cs
+++ b/MediaBrowser.Model/Services/RouteAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Services
 {