Tidy: Sort/remove usings, simplify names

Disco.Services/Devices/Enrolment/DeviceEnrolment.cs

@@ -344,7 +344,7 @@ namespace Disco.Services.Devices.Enrolment
                         if (domain == null)
                             domain = ActiveDirectory.Context.GetDomainByName(Request.DNSDomainName);
 
-                        if (!authenticatedToken.User.UserId.Equals(string.Format(@"{0}\{1}$", domain.NetBiosName, Request.ComputerName), System.StringComparison.OrdinalIgnoreCase))
+                        if (!authenticatedToken.User.UserId.Equals(string.Format(@"{0}\{1}$", domain.NetBiosName, Request.ComputerName), StringComparison.OrdinalIgnoreCase))
                             throw new EnrolmentSafeException(string.Format("Connection not correctly authenticated (SN: {0}; Auth User: {1})", Request.SerialNumber, authenticatedToken.User.UserId));
                     }
                 }

Disco.Services/Devices/Enrolment/EnrolmentTypes.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Disco.Services.Devices.Enrolment
+namespace Disco.Services.Devices.Enrolment
 {
     public enum EnrolmentTypes
     {

Disco.Services/Devices/Enrolment/LogMacAddressImportingTask.cs

@@ -54,7 +54,7 @@ namespace Disco.Services.Devices.Enrolment
                 var trigger = TriggerBuilder.Create()
                     .StartAt(DateTimeOffset.Now.AddMinutes(5));
 
-                this.ScheduleTask(trigger);
+                ScheduleTask(trigger);
             }
         }