diff --git a/src/Yavsc/Services/YavscMessageSender.cs b/src/Yavsc/Services/YavscMessageSender.cs
index 0a1be895..5bef57ee 100644
--- a/src/Yavsc/Services/YavscMessageSender.cs
+++ b/src/Yavsc/Services/YavscMessageSender.cs
@@ -11,7 +11,6 @@ using Yavsc.Models;
 using Yavsc.Models.Google.Messaging;
 using Yavsc.Models.Haircut;
 using Yavsc.Models.Messaging;
-using Yavsc.Services;
 
 namespace Yavsc.Services
 {
diff --git a/src/cli/Program.cs b/src/cli/Program.cs
index 6945cf83..becfa52a 100644
--- a/src/cli/Program.cs
+++ b/src/cli/Program.cs
@@ -1,7 +1,6 @@
 
 using System;
 using cli.Commands;
-using cli.Services;
 using Microsoft.Extensions.CommandLineUtils;
 
 namespace cli
diff --git a/src/cli/Startup.cs b/src/cli/Startup.cs
index 3e191e64..48f70aa9 100644
--- a/src/cli/Startup.cs
+++ b/src/cli/Startup.cs
@@ -25,7 +25,6 @@ using System.Runtime.Versioning;
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.CodeGeneration.EntityFramework;
-using Microsoft.Extensions.CodeGeneration.Templating.Compilation;
 using System.Linq;
 
 namespace cli
diff --git a/src/omnisharp.log b/src/omnisharp.log
deleted file mode 100644
index bc3f0807..00000000
--- a/src/omnisharp.log
+++ /dev/null
@@ -1 +0,0 @@
-["-s","/home/paul/workspace/yavsc/src/Yavsc","--hostPID","21136","DotNet:enablePackageRestore=false","--encoding","utf-8","--loglevel","trace","MsBuild:LoadProjectsOnDemand=true","RoslynExtensionsOptions:EnableAnalyzersSupport=true"]
\ No newline at end of file
diff --git a/src/sampleWebAsWebApiClient/Controllers/HomeController.cs b/src/sampleWebAsWebApiClient/Controllers/HomeController.cs
index 761b4395..85d1d2af 100755
--- a/src/sampleWebAsWebApiClient/Controllers/HomeController.cs
+++ b/src/sampleWebAsWebApiClient/Controllers/HomeController.cs
@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Json;
-using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Extensions.Logging;
+using Yavsc.Server.Helpers;
+using Yavsc.Server.Model;
 
 namespace testOauthClient.Controllers
 {
diff --git a/src/test/Settings/DbConnectionSettings.cs b/src/test/Settings/DbConnectionSettings.cs
index b81a7cf0..727db4ac 100644
--- a/src/test/Settings/DbConnectionSettings.cs
+++ b/src/test/Settings/DbConnectionSettings.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace test.Settings
 {
     public class DbConnectionSettings
diff --git a/src/test/Startup.cs b/src/test/Startup.cs
index ab3c88d9..547a82c2 100644
--- a/src/test/Startup.cs
+++ b/src/test/Startup.cs
@@ -12,7 +12,6 @@ using Yavsc.Models;
 using Yavsc.Services;
 using Microsoft.Data.Entity;
 using Microsoft.Extensions.WebEncoders;
-using Yavsc.Lib;
 using test.Settings;
 
 namespace test
@@ -62,7 +61,7 @@ namespace test
             services.AddEntityFramework().AddNpgsql().AddDbContext<ApplicationDbContext>();
             services.AddTransient((s) => new RazorTemplateEngine(s.GetService<RazorEngineHost>()));
             services.AddLogging();
-            services.AddTransient<EMailer>();
+            services.AddTransient<MailSender>();
             services.AddLocalization(options =>
             {
                 options.ResourcesPath = "Resources";