diff --git a/NetrunnerChallenge.sln b/NetrunnerChallenge.sln
index 427c2d3..b0974d7 100644
--- a/NetrunnerChallenge.sln
+++ b/NetrunnerChallenge.sln
@@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetrunnerChallenge", "src\NetrunnerChallenge\NetrunnerChallenge.csproj", "{7CA56BAF-0A0F-4358-83CE-02D842913465}"
 EndProject
 Global
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
diff --git a/src/NetrunnerChallenge/App_Start/BundleConfig.cs b/src/NetrunnerChallenge/App_Start/BundleConfig.cs
index f62a515..7145649 100644
--- a/src/NetrunnerChallenge/App_Start/BundleConfig.cs
+++ b/src/NetrunnerChallenge/App_Start/BundleConfig.cs
@@ -1,5 +1,4 @@
-using System.Web;
-using System.Web.Optimization;
+using System.Web.Optimization;
 
 namespace NetrunnerChallenge
 {
diff --git a/src/NetrunnerChallenge/App_Start/FilterConfig.cs b/src/NetrunnerChallenge/App_Start/FilterConfig.cs
index 47b254d..230c969 100644
--- a/src/NetrunnerChallenge/App_Start/FilterConfig.cs
+++ b/src/NetrunnerChallenge/App_Start/FilterConfig.cs
@@ -1,5 +1,4 @@
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 
 namespace NetrunnerChallenge
 {
diff --git a/src/NetrunnerChallenge/App_Start/RouteConfig.cs b/src/NetrunnerChallenge/App_Start/RouteConfig.cs
index 7257420..83c0d41 100644
--- a/src/NetrunnerChallenge/App_Start/RouteConfig.cs
+++ b/src/NetrunnerChallenge/App_Start/RouteConfig.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
 
 namespace NetrunnerChallenge
diff --git a/src/NetrunnerChallenge/Controllers/HomeController.cs b/src/NetrunnerChallenge/Controllers/HomeController.cs
index c0d7fd6..633ff18 100644
--- a/src/NetrunnerChallenge/Controllers/HomeController.cs
+++ b/src/NetrunnerChallenge/Controllers/HomeController.cs
@@ -3,13 +3,11 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
-using System.Web;
 using System.Web.Mvc;
 using NetrunnerChallenge.Data;
 using NetrunnerChallenge.Extensions;
 using NetrunnerChallenge.Models;
 using NetrunnerDb.Net.Responses;
-using Newtonsoft.Json;
 
 namespace NetrunnerChallenge.Controllers
 {
@@ -53,15 +51,8 @@ namespace NetrunnerChallenge.Controllers
                     cards.Add(new NetrunnerApi().GetCard(a.Code).First());
                 });
                 var viewModel = new ChallengeResultViewModel {Cards = cards, Challenge = challege};
-                if (this.HttpContext.Request.IsAjaxRequest())
-                {
-                    return PartialView("Challenge",viewModel);
-                }
-                else
-                {
+               
                     return View("Challenge", viewModel);
-                }
-                
             }
         }
 
diff --git a/src/NetrunnerChallenge/Data/DatabaseContext.cs b/src/NetrunnerChallenge/Data/DatabaseContext.cs
index 6bc64b8..cf700b5 100644
--- a/src/NetrunnerChallenge/Data/DatabaseContext.cs
+++ b/src/NetrunnerChallenge/Data/DatabaseContext.cs
@@ -1,9 +1,5 @@
-using NetrunnerChallenge.Models;
-using System;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
-using System.Web;
+using System.Data.Entity;
+using NetrunnerChallenge.Models;
 
 namespace NetrunnerChallenge.Data
 {
diff --git a/src/NetrunnerChallenge/Data/Generator.cs b/src/NetrunnerChallenge/Data/Generator.cs
index 81ddc4f..b61920d 100644
--- a/src/NetrunnerChallenge/Data/Generator.cs
+++ b/src/NetrunnerChallenge/Data/Generator.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 
 namespace NetrunnerChallenge.Data
 {
diff --git a/src/NetrunnerChallenge/Extensions/CollectionExtension.cs b/src/NetrunnerChallenge/Extensions/CollectionExtension.cs
index 2235523..4d64c85 100644
--- a/src/NetrunnerChallenge/Extensions/CollectionExtension.cs
+++ b/src/NetrunnerChallenge/Extensions/CollectionExtension.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using WebGrease.Css.Extensions;
 
 namespace NetrunnerChallenge.Extensions
diff --git a/src/NetrunnerChallenge/Global.asax.cs b/src/NetrunnerChallenge/Global.asax.cs
index c382561..db9720e 100644
--- a/src/NetrunnerChallenge/Global.asax.cs
+++ b/src/NetrunnerChallenge/Global.asax.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using System.Web;
 using System.Web.Mvc;
 using System.Web.Optimization;
 using System.Web.Routing;
@@ -9,7 +6,7 @@ using NetrunnerChallenge.Data;
 
 namespace NetrunnerChallenge
 {
-    public class MvcApplication : System.Web.HttpApplication
+    public class MvcApplication : HttpApplication
     {
         protected void Application_Start()
         {
diff --git a/src/NetrunnerChallenge/Migrations/201505210056465_1.Designer.cs b/src/NetrunnerChallenge/Migrations/201505210056465_1.Designer.cs
index 55312f2..ec21e53 100644
--- a/src/NetrunnerChallenge/Migrations/201505210056465_1.Designer.cs
+++ b/src/NetrunnerChallenge/Migrations/201505210056465_1.Designer.cs
@@ -1,11 +1,11 @@
 // <auto-generated />
+
+using System.CodeDom.Compiler;
+using System.Data.Entity.Migrations.Infrastructure;
+using System.Resources;
+
 namespace NetrunnerChallenge.Migrations
 {
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
     [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
     public sealed partial class _1 : IMigrationMetadata
     {
diff --git a/src/NetrunnerChallenge/Migrations/201505210056465_1.cs b/src/NetrunnerChallenge/Migrations/201505210056465_1.cs
index 91c8353..5f58883 100644
--- a/src/NetrunnerChallenge/Migrations/201505210056465_1.cs
+++ b/src/NetrunnerChallenge/Migrations/201505210056465_1.cs
@@ -1,8 +1,7 @@
+using System.Data.Entity.Migrations;
+
 namespace NetrunnerChallenge.Migrations
 {
-    using System;
-    using System.Data.Entity.Migrations;
-    
     public partial class _1 : DbMigration
     {
         public override void Up()
diff --git a/src/NetrunnerChallenge/Migrations/201505210149251_2.Designer.cs b/src/NetrunnerChallenge/Migrations/201505210149251_2.Designer.cs
index f17e0fb..b12dd48 100644
--- a/src/NetrunnerChallenge/Migrations/201505210149251_2.Designer.cs
+++ b/src/NetrunnerChallenge/Migrations/201505210149251_2.Designer.cs
@@ -1,11 +1,11 @@
 // <auto-generated />
+
+using System.CodeDom.Compiler;
+using System.Data.Entity.Migrations.Infrastructure;
+using System.Resources;
+
 namespace NetrunnerChallenge.Migrations
 {
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
     [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
     public sealed partial class _2 : IMigrationMetadata
     {
diff --git a/src/NetrunnerChallenge/Migrations/201505210149251_2.cs b/src/NetrunnerChallenge/Migrations/201505210149251_2.cs
index 4137d92..4e89ea0 100644
--- a/src/NetrunnerChallenge/Migrations/201505210149251_2.cs
+++ b/src/NetrunnerChallenge/Migrations/201505210149251_2.cs
@@ -1,8 +1,7 @@
+using System.Data.Entity.Migrations;
+
 namespace NetrunnerChallenge.Migrations
 {
-    using System;
-    using System.Data.Entity.Migrations;
-    
     public partial class _2 : DbMigration
     {
         public override void Up()
diff --git a/src/NetrunnerChallenge/Migrations/201505210212299_3.Designer.cs b/src/NetrunnerChallenge/Migrations/201505210212299_3.Designer.cs
index 3560226..7e4a817 100644
--- a/src/NetrunnerChallenge/Migrations/201505210212299_3.Designer.cs
+++ b/src/NetrunnerChallenge/Migrations/201505210212299_3.Designer.cs
@@ -1,11 +1,11 @@
 // <auto-generated />
+
+using System.CodeDom.Compiler;
+using System.Data.Entity.Migrations.Infrastructure;
+using System.Resources;
+
 namespace NetrunnerChallenge.Migrations
 {
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
     [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
     public sealed partial class _3 : IMigrationMetadata
     {
diff --git a/src/NetrunnerChallenge/Migrations/201505210212299_3.cs b/src/NetrunnerChallenge/Migrations/201505210212299_3.cs
index e64c0ac..23d4dc7 100644
--- a/src/NetrunnerChallenge/Migrations/201505210212299_3.cs
+++ b/src/NetrunnerChallenge/Migrations/201505210212299_3.cs
@@ -1,8 +1,7 @@
+using System.Data.Entity.Migrations;
+
 namespace NetrunnerChallenge.Migrations
 {
-    using System;
-    using System.Data.Entity.Migrations;
-    
     public partial class _3 : DbMigration
     {
         public override void Up()
diff --git a/src/NetrunnerChallenge/Migrations/201505231941109_4.Designer.cs b/src/NetrunnerChallenge/Migrations/201505231941109_4.Designer.cs
index e1b12b9..ea571c4 100644
--- a/src/NetrunnerChallenge/Migrations/201505231941109_4.Designer.cs
+++ b/src/NetrunnerChallenge/Migrations/201505231941109_4.Designer.cs
@@ -1,11 +1,11 @@
 // <auto-generated />
+
+using System.CodeDom.Compiler;
+using System.Data.Entity.Migrations.Infrastructure;
+using System.Resources;
+
 namespace NetrunnerChallenge.Migrations
 {
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
     [GeneratedCode("EntityFramework.Migrations", "6.1.2-31219")]
     public sealed partial class _4 : IMigrationMetadata
     {
diff --git a/src/NetrunnerChallenge/Migrations/201505231941109_4.cs b/src/NetrunnerChallenge/Migrations/201505231941109_4.cs
index 323334f..98f2369 100644
--- a/src/NetrunnerChallenge/Migrations/201505231941109_4.cs
+++ b/src/NetrunnerChallenge/Migrations/201505231941109_4.cs
@@ -1,11 +1,7 @@
-using System.Linq;
-using NetrunnerChallenge.Data;
+using System.Data.Entity.Migrations;
 
 namespace NetrunnerChallenge.Migrations
 {
-    using System;
-    using System.Data.Entity.Migrations;
-    
     public partial class _4 : DbMigration
     {
         public override void Up()
diff --git a/src/NetrunnerChallenge/Migrations/Configuration.cs b/src/NetrunnerChallenge/Migrations/Configuration.cs
index a3b0e58..799b48b 100644
--- a/src/NetrunnerChallenge/Migrations/Configuration.cs
+++ b/src/NetrunnerChallenge/Migrations/Configuration.cs
@@ -1,20 +1,17 @@
+using System.Data.Entity.Migrations;
+using NetrunnerChallenge.Data;
 using NetrunnerChallenge.Models;
 
 namespace NetrunnerChallenge.Migrations
 {
-    using System;
-    using System.Data.Entity;
-    using System.Data.Entity.Migrations;
-    using System.Linq;
-
-    internal sealed class Configuration : DbMigrationsConfiguration<NetrunnerChallenge.Data.DatabaseContext>
+    internal sealed class Configuration : DbMigrationsConfiguration<DatabaseContext>
     {
         public Configuration()
         {
             AutomaticMigrationsEnabled = true;
         }
 
-        protected override void Seed(NetrunnerChallenge.Data.DatabaseContext context)
+        protected override void Seed(DatabaseContext context)
         {
             context.FactionsDb.AddOrUpdate(new Faction[]
             {
diff --git a/src/NetrunnerChallenge/Models/Challenge.cs b/src/NetrunnerChallenge/Models/Challenge.cs
index bbfd65a..0a2004f 100644
--- a/src/NetrunnerChallenge/Models/Challenge.cs
+++ b/src/NetrunnerChallenge/Models/Challenge.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Web;
 using NetrunnerChallenge.Extensions;
 
 namespace NetrunnerChallenge.Models
diff --git a/src/NetrunnerChallenge/Models/ChallengeCard.cs b/src/NetrunnerChallenge/Models/ChallengeCard.cs
index d429e00..506e5c3 100644
--- a/src/NetrunnerChallenge/Models/ChallengeCard.cs
+++ b/src/NetrunnerChallenge/Models/ChallengeCard.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Web;
+using System.ComponentModel.DataAnnotations;
 
 namespace NetrunnerChallenge.Models
 {
diff --git a/src/NetrunnerChallenge/Models/ChallengeResultViewModel.cs b/src/NetrunnerChallenge/Models/ChallengeResultViewModel.cs
index 7debf3d..fc32e55 100644
--- a/src/NetrunnerChallenge/Models/ChallengeResultViewModel.cs
+++ b/src/NetrunnerChallenge/Models/ChallengeResultViewModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using System.Collections.Generic;
 using NetrunnerDb.Net.Responses;
 
 namespace NetrunnerChallenge.Models
diff --git a/src/NetrunnerChallenge/Models/Faction.cs b/src/NetrunnerChallenge/Models/Faction.cs
index 7c12310..55857e2 100644
--- a/src/NetrunnerChallenge/Models/Faction.cs
+++ b/src/NetrunnerChallenge/Models/Faction.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Web;
+using System.ComponentModel.DataAnnotations;
 
 namespace NetrunnerChallenge.Models
 {
diff --git a/src/NetrunnerChallenge/Properties/AssemblyInfo.cs b/src/NetrunnerChallenge/Properties/AssemblyInfo.cs
index 04c1774..2045ae9 100644
--- a/src/NetrunnerChallenge/Properties/AssemblyInfo.cs
+++ b/src/NetrunnerChallenge/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following