4 files changed, 17 insertions, 27 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index e8e90b97a..4e63160fc 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
@@ -313,7 +312,7 @@ namespace MediaBrowser.Controller.Entities
             var path = Path;
 
             // non file-system entries will not have a path
-            if (this.LocationType != LocationType.FileSystem || string.IsNullOrEmpty(path))
+            if (LocationType != LocationType.FileSystem || string.IsNullOrEmpty(path))
             {
                 return new ItemResolveArgs(ConfigurationManager.ApplicationPaths)
                 {
@@ -637,12 +636,12 @@ namespace MediaBrowser.Controller.Entities
             catch (IOException ex)
             {
                 Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
-                return new List<Video> { };
+                return new List<Video>();
             }
 
             if (!resolveArgs.IsDirectory)
             {
-                return new List<Video> { };
+                return new List<Video>();
             }
 
             var folder = resolveArgs.GetFileSystemEntryByName(TrailerFolderName);
@@ -650,7 +649,7 @@ namespace MediaBrowser.Controller.Entities
             // Path doesn't exist. No biggie
             if (folder == null)
             {
-                return new List<Video> { };
+                return new List<Video>();
             }
 
             IEnumerable<WIN32_FIND_DATA> files;
@@ -662,7 +661,7 @@ namespace MediaBrowser.Controller.Entities
             catch (IOException ex)
             {
                 Logger.ErrorException("Error loading trailers for {0}", ex, Name);
-                return new List<Video> { };
+                return new List<Video>();
             }
 
             return LibraryManager.ResolvePaths<Video>(files, null).Select(video =>
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index d34fb75a7..f862ce61b 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Resolvers;
-using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Concurrent;
@@ -714,7 +713,7 @@ namespace MediaBrowser.Controller.Entities
             catch (IOException ex)
             {
                 Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
-                return new List<BaseItem> { };
+                return new List<BaseItem>();
             }
 
             return LibraryManager.ResolvePaths<BaseItem>(fileSystemChildren, this);
@@ -754,12 +753,7 @@ namespace MediaBrowser.Controller.Entities
             }
 
             // If indexed is false or the indexing function is null
-            if (result == null)
-            {
-                result = ActualChildren.Where(c => c.IsVisible(user));
-            }
-
-            return result;
+            return result ?? (ActualChildren.Where(c => c.IsVisible(user)));
         }
 
         /// <summary>
@@ -799,7 +793,7 @@ namespace MediaBrowser.Controller.Entities
         {
             await base.ChangedExternally().ConfigureAwait(false);
 
-            var progress = new Progress<double> { };
+            var progress = new Progress<double>();
 
             await ValidateChildren(progress, CancellationToken.None).ConfigureAwait(false);
         }
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index ac12abcef..d08588077 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -118,14 +118,12 @@ namespace MediaBrowser.Controller.Entities.Movies
             cancellationToken.ThrowIfCancellationRequested();
 
             return result;
-        }      
-        
+        }
+
         /// <summary>
-        /// Loads special features from the file system
+        /// Loads the special features.
         /// </summary>
-        /// <param name="entity">The entity.</param>
-        /// <returns>List{Video}.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <returns>IEnumerable{Video}.</returns>
         private IEnumerable<Video> LoadSpecialFeatures()
         {
             WIN32_FIND_DATA? folder;
@@ -137,13 +135,13 @@ namespace MediaBrowser.Controller.Entities.Movies
             catch (IOException ex)
             {
                 Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
-                return new List<Video> { };
+                return new List<Video>();
             }
 
             // Path doesn't exist. No biggie
             if (folder == null)
             {
-                return new List<Video> { };
+                return new List<Video>();
             }
 
             IEnumerable<WIN32_FIND_DATA> files;
@@ -155,7 +153,7 @@ namespace MediaBrowser.Controller.Entities.Movies
             catch (IOException ex)
             {
                 Logger.ErrorException("Error loading trailers for {0}", ex, Name);
-                return new List<Video> { };
+                return new List<Video>();
             }
 
             return LibraryManager.ResolvePaths<Video>(files, null).Select(video =>
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 954dfb05f..edca21ae7 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -5,7 +5,6 @@ using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
@@ -266,7 +265,7 @@ namespace MediaBrowser.Controller.Entities
             RootFolder = null;
 
             // Kick off a task to validate the media library
-            Task.Run(() => ValidateMediaLibrary(new Progress<double> { }, CancellationToken.None));
+            Task.Run(() => ValidateMediaLibrary(new Progress<double>(), CancellationToken.None));
 
             return RefreshMetadata(CancellationToken.None, forceSave: true, forceRefresh: true);
         }