diff --git a/src/Yavsc/ApiControllers/Musical/DjProfileApiController.cs b/src/Yavsc/ApiControllers/Musical/DjProfileApiController.cs
index cd9cdbc8..050241a7 100644
--- a/src/Yavsc/ApiControllers/Musical/DjProfileApiController.cs
+++ b/src/Yavsc/ApiControllers/Musical/DjProfileApiController.cs
@@ -1,7 +1,7 @@
 namespace Yavsc.ApiControllers
 {
     using Models;
-    using Models.Musical.Profiles;
+    using Yavsc.Models.Musical.Profiles;
 
     public class DjProfileApiController : ProfileApiController<DjSettings>
     {
diff --git a/src/Yavsc/ApiControllers/Streaming/LiveApiController.cs b/src/Yavsc/ApiControllers/Streaming/LiveApiController.cs
index a71b7a2f..eec1fade 100644
--- a/src/Yavsc/ApiControllers/Streaming/LiveApiController.cs
+++ b/src/Yavsc/ApiControllers/Streaming/LiveApiController.cs
@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+
 using System.Linq;
 using System.Net.WebSockets;
 using System.Security.Claims;
@@ -7,11 +7,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Data.Entity;
-using Microsoft.Extensions.Logging;
 using Yavsc.Models;
 using Yavsc.Models.Streaming;
 using Yavsc.Services;
-using Yavsc.ViewModels.Streaming;
 
 namespace Yavsc.Controllers
 {
diff --git a/src/Yavsc/Helpers/GoogleOAuthHelpers.cs b/src/Yavsc/Helpers/GoogleOAuthHelpers.cs
index 75867cfd..e758a213 100644
--- a/src/Yavsc/Helpers/GoogleOAuthHelpers.cs
+++ b/src/Yavsc/Helpers/GoogleOAuthHelpers.cs
@@ -33,15 +33,13 @@ using Google.Apis.Auth.OAuth2.Flows;
 using Google.Apis.Util.Store;
 using Google.Apis.Auth.OAuth2.Responses;
 using Google.Apis.Util;
+using Yavsc.Models;
+using Yavsc.Models.Calendar;
+using Yavsc.Services;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Helpers
 {
-    using Models;
-    using Models.Calendar;
-    using Services;
-    using Server.Helpers;
-
-
     /// <summary>
     /// Google helpers.
     /// </summary>