Tidy: Sort/remove usings, simplify names

Disco.Services/Users/UserFlags/Cache.cs

@@ -26,7 +26,7 @@ namespace Disco.Services.Users.UserFlags
             var flags = Database.UserFlags.ToList();
 
             // Add Queues to In-Memory Cache
-            this._Cache = new ConcurrentDictionary<int, UserFlag>(flags.Select(f => new KeyValuePair<int, UserFlag>(f.Id, f)));
+            _Cache = new ConcurrentDictionary<int, UserFlag>(flags.Select(f => new KeyValuePair<int, UserFlag>(f.Id, f)));
         }
 
         public UserFlag GetUserFlag(int UserFlagId)

Disco.Services/Users/UserFlags/UserFlagService.cs

@@ -4,12 +4,8 @@ using Disco.Models.Repository;
 using Disco.Services.Extensions;
 using Disco.Services.Tasks;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Reactive.Linq;
 
 namespace Disco.Services.Users.UserFlags

Disco.Services/Users/UserFlags/UserFlagUserDevicesManagedGroup.cs

@@ -29,8 +29,8 @@ namespace Disco.Services.Users.UserFlags
         private UserFlagUserDevicesManagedGroup(string Key, ADManagedGroupConfiguration Configuration, UserFlag UserFlag)
             : base(Key, Configuration)
         {
-            this.UserFlagId = UserFlag.Id;
-            this.UserFlagName = UserFlag.Name;
+            UserFlagId = UserFlag.Id;
+            UserFlagName = UserFlag.Name;
         }
 
         public override void Initialize()

Disco.Services/Users/UserFlags/UserFlagUsersManagedGroup.cs

@@ -29,8 +29,8 @@ namespace Disco.Services.Users.UserFlags
         private UserFlagUsersManagedGroup(string Key, ADManagedGroupConfiguration Configuration, UserFlag UserFlag)
             : base(Key, Configuration)
         {
-            this.UserFlagId = UserFlag.Id;
-            this.UserFlagName = UserFlag.Name;
+            UserFlagId = UserFlag.Id;
+            UserFlagName = UserFlag.Name;
         }
 
         public override void Initialize()

Disco.Services/Users/UserFlags/UserFlagsDeleteTask.cs

@@ -18,7 +18,7 @@ namespace Disco.Services.Users.UserFlags
 
             using (DiscoDataContext Database = new DiscoDataContext())
             {
-                UserFlagService.DeleteUserFlag(Database, UserFlagId, this.Status);
+                UserFlagService.DeleteUserFlag(Database, UserFlagId, Status);
             }
         }
 

Disco.Services/Users/UserService.cs

@@ -7,12 +7,9 @@ using Disco.Services.Logging;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Data.Entity.Infrastructure;
 using System.DirectoryServices.ActiveDirectory;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web;
 
 namespace Disco.Services.Users

Disco.Services/Users/UserUpdatesHub.cs

@@ -4,9 +4,7 @@ using Disco.Services.Web.Signalling;
 using Microsoft.AspNet.SignalR;
 using Microsoft.AspNet.SignalR.Hubs;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Reactive.Linq;
 using Disco.Models.Repository;