diff --git a/PlexRequestes.Automation.Helpers/PlexRequestes.Automation.Helpers.csproj b/PlexRequestes.Automation.Helpers/PlexRequestes.Automation.Helpers.csproj
index 850f474fa..388b6240e 100644
--- a/PlexRequestes.Automation.Helpers/PlexRequestes.Automation.Helpers.csproj
+++ b/PlexRequestes.Automation.Helpers/PlexRequestes.Automation.Helpers.csproj
@@ -61,6 +61,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/PlexRequestes.Automation.Helpers/app.config b/PlexRequestes.Automation.Helpers/app.config
new file mode 100644
index 000000000..de5386a47
--- /dev/null
+++ b/PlexRequestes.Automation.Helpers/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/PlexRequests.Automation.Pages/PlexRequests.Automation.Pages.csproj b/PlexRequests.Automation.Pages/PlexRequests.Automation.Pages.csproj
index 4a7817af0..4862f85a2 100644
--- a/PlexRequests.Automation.Pages/PlexRequests.Automation.Pages.csproj
+++ b/PlexRequests.Automation.Pages/PlexRequests.Automation.Pages.csproj
@@ -55,6 +55,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/PlexRequests.Automation.Pages/app.config b/PlexRequests.Automation.Pages/app.config
new file mode 100644
index 000000000..de5386a47
--- /dev/null
+++ b/PlexRequests.Automation.Pages/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/PlexRequests.Automation/PlexRequests.Automation.csproj b/PlexRequests.Automation/PlexRequests.Automation.csproj
index b9218b815..860494646 100644
--- a/PlexRequests.Automation/PlexRequests.Automation.csproj
+++ b/PlexRequests.Automation/PlexRequests.Automation.csproj
@@ -65,6 +65,7 @@
     <Compile Include="WebDriverSetup.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/PlexRequests.Automation/app.config b/PlexRequests.Automation/app.config
new file mode 100644
index 000000000..de5386a47
--- /dev/null
+++ b/PlexRequests.Automation/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/PlexRequests.Core/PlexRequests.Core.csproj b/PlexRequests.Core/PlexRequests.Core.csproj
index 15424b811..a228cd255 100644
--- a/PlexRequests.Core/PlexRequests.Core.csproj
+++ b/PlexRequests.Core/PlexRequests.Core.csproj
@@ -31,10 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MediatR, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediatR.2.1.0\lib\net45\MediatR.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Mono.Data.Sqlite">
       <HintPath>..\Assemblies\Mono.Data.Sqlite.dll</HintPath>
     </Reference>
diff --git a/PlexRequests.Core/packages.config b/PlexRequests.Core/packages.config
index f55649f70..9f54b7236 100644
--- a/PlexRequests.Core/packages.config
+++ b/PlexRequests.Core/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediatR" version="2.1.0" targetFramework="net45" />
   <package id="Nancy" version="1.4.3" targetFramework="net45" />
   <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
diff --git a/PlexRequests.UI/NinjectModules/MediatRModule.cs b/PlexRequests.UI/NinjectModules/MediatRModule.cs
deleted file mode 100644
index a63fc4a26..000000000
--- a/PlexRequests.UI/NinjectModules/MediatRModule.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-#region Copyright
-// /************************************************************************
-//    Copyright (c) 2016 Jamie Rees
-//    File: MediatRModule.cs
-//    Created By: Jamie Rees
-//   
-//    Permission is hereby granted, free of charge, to any person obtaining
-//    a copy of this software and associated documentation files (the
-//    "Software"), to deal in the Software without restriction, including
-//    without limitation the rights to use, copy, modify, merge, publish,
-//    distribute, sublicense, and/or sell copies of the Software, and to
-//    permit persons to whom the Software is furnished to do so, subject to
-//    the following conditions:
-//   
-//    The above copyright notice and this permission notice shall be
-//    included in all copies or substantial portions of the Software.
-//   
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//  ************************************************************************/
-#endregion
-using MediatR;
-
-using Ninject;
-using Ninject.Extensions.Conventions;
-using Ninject.Modules;
-
-namespace PlexRequests.UI.NinjectModules
-{
-    public class MediatRModule : NinjectModule
-    {
-        public override void Load()
-        {
-            Kernel.Bind(scan => scan.FromAssemblyContaining<IMediator>().SelectAllClasses().BindDefaultInterface());
-
-            Bind<SingleInstanceFactory>().ToMethod(ctx => t => ctx.Kernel.Get(t));
-            Bind<MultiInstanceFactory>().ToMethod(ctx => t => ctx.Kernel.GetAll(t));
-
-            Kernel.Bind(x => x.FromThisAssembly()
-                .SelectAllClasses()
-                .InheritedFromAny(typeof(IRequestHandler<,>), typeof(IAsyncRequestHandler<,>))
-                .BindDefaultInterfaces());
-
-            //kernel.Bind(scan => scan.FromAssemblyContaining<LandingPageCommand>().SelectAllInterfaces().BindAllInterfaces());
-        }
-    }
-}
\ No newline at end of file
diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
index 9ee779ee4..1dcd90274 100644
--- a/PlexRequests.UI/PlexRequests.UI.csproj
+++ b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -53,10 +53,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MediatR, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediatR.2.1.0\lib\net45\MediatR.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
       <Private>True</Private>
@@ -93,10 +89,6 @@
       <HintPath>..\packages\Ninject.Extensions.ChildKernel.3.2.0.0\lib\net45-full\Ninject.Extensions.ChildKernel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Ninject.Extensions.Conventions, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ninject.Extensions.Conventions.3.2.0.0\lib\net45-full\Ninject.Extensions.Conventions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.3.4\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
@@ -232,7 +224,6 @@
     <Compile Include="NinjectModules\ApiModule.cs" />
     <Compile Include="NinjectModules\ConfigurationModule.cs" />
     <Compile Include="NinjectModules\DependancyResolver.cs" />
-    <Compile Include="NinjectModules\MediatRModule.cs" />
     <Compile Include="NinjectModules\RepositoryModule.cs" />
     <Compile Include="NinjectModules\ServicesModule.cs" />
     <Compile Include="NinjectModules\SettingServiceModule.cs" />
diff --git a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
index ce7bddbf2..0ea7078b1 100644
--- a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
@@ -1,174 +1,174 @@
-@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
-@{
-    int port;
-    if (Model.EmailPort == 0)
-    {
-        port = 25;
-    }
-    else
-    {
-        port = Model.EmailPort;
-    }
-}
-<div class="col-sm-8 col-sm-push-1">
-    <form class="form-horizontal" method="POST" id="mainForm">
-        <fieldset>
-            <legend>Email Notifications</legend>
-
-            <div class="form-group">
-                <div class="checkbox">
-                    
-                        @if (Model.Enabled)
-                        {
-                            <input type="checkbox" id="Enabled" name="Enabled" checked="checked"><label for="Enabled">Enabled</label>
-                        }
-                        else
-                        {
-                            <input type="checkbox" id="Enabled" name="Enabled"><label for="Enabled">Enabled</label>
-                        }
-                
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="checkbox">
-
-                        @if (Model.EnableUserEmailNotifications)
-                        {
-                            <input type="checkbox" id="EnableUserEmailNotifications" name="EnableUserEmailNotifications" checked="checked"><label for="EnableUserEmailNotifications">Enable user email notifications</label>
-                        }
-                        else
-                        {
-                            <input type="checkbox" id="EnableUserEmailNotifications" name="EnableUserEmailNotifications"><label for="EnableUserEmailNotifications">Enable user email notifications</label>
-                        }
-         
-                </div>
-            </div>
-            <small>Please note that if user notifications is enabled, the email will get sent with the SMTP set-up below.</small>
-            <div class="form-group">
-                <label for="EmailHost" class="control-label">SMTP Host name or IP</label>
-                <div class="">
-                    <input type="text" class="form-control form-control-custom " id="EmailHost" name="EmailHost" placeholder="localhost" value="@Model.EmailHost">
-                </div>
-            </div>
-
-            <div class="form-group">
-                <label for="EmailPort" class="control-label">SMTP Port</label>
-
-                <div class="">
-                    <input type="text" class="form-control form-control-custom " id="EmailPort" name="EmailPort" placeholder="Port Number" value="@port">
-                </div>
-            </div>
-
-
-            <div class="form-group">
-                <label for="EmailSender" class="control-label">Email Sender</label>
-                <div>
-                    <input type="text" class="form-control form-control-custom " id="EmailSender" name="EmailSender" value="@Model.EmailSender">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="RecipientEmail" class="control-label">Email Recipient</label>
-                <div>
-                    <input type="text" class="form-control form-control-custom " id="RecipientEmail" name="RecipientEmail" value="@Model.RecipientEmail">
-                </div>
-            </div>
-
-
-
-            <div class="form-group">
-                <label for="EmailUsername" class="control-label">Username</label>
-                <div>
-                    <input type="text" class="form-control form-control-custom " id="EmailUsername" name="EmailUsername" value="@Model.EmailUsername">
-                </div>
-            </div>
-
-            <div class="form-group">
-                <label for="EmailPassword" class="control-label">Password</label>
-                <div>
-                    <input type="password" class="form-control form-control-custom " id="EmailPassword" name="EmailPassword" value="@Model.EmailPassword">
-                </div>
-            </div>
-
-            <div class="form-group">
-                <div>
-                    <button id="testEmail" type="submit" class="btn btn-primary-outline">Test <div id="spinner"></div></button>
-                </div>
-            </div>
-
-            <div class="form-group">
-                <div>
-                    <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
-                </div>
-            </div>
-        </fieldset>
-    </form>
-</div>
-
-<script>
-    $(function () {
-
-        var base = '@Html.GetBaseUrl()';
-        $('#save').click(function (e) {
-            e.preventDefault();
-            var port = $('#EmailPort').val();
-            if (isNaN(port)) {
-                generateNotify("You must specify a valid Port.", "warning");
-                return;
-            }
-            var $form = $("#mainForm");
-            $.ajax({
-                type: $form.prop("method"),
-                data: $form.serialize(),
-                url: $form.prop("action"),
-                dataType: "json",
-                success: function (response) {
-                    if (response.result === true) {
-                        generateNotify(response.message, "success");
-                    } else {
-                        generateNotify(response.message, "warning");
-                    }
-                },
-                error: function (e) {
-                    console.log(e);
-                    generateNotify("Something went wrong!", "danger");
-                }
-            });
-        });
-
-	        $('#testEmail').click(function (e) {
-	         	$('#spinner').attr("class", "fa fa-spinner fa-spin");
-
-            var url = createBaseUrl(base, '/admin/testemailnotification');
-            e.preventDefault();
-            var port = $('#EmailPort').val();
-            if (isNaN(port)) {
-                generateNotify("You must specify a valid Port.", "warning");
-                return;
-            }
-            var $form = $("#mainForm");
-            $.ajax({
-                type: $form.prop("method"),
-                data: $form.serialize(),
-                url: url,
-                dataType: "json",
-                success: function (response) {
-                    if (response.result === true) {
-        				$('#spinner').attr("class", "fa fa-check");
-                        generateNotify(response.message, "success");
-                    } else {
-        				$('#spinner').attr("class", "fa fa-times");
-                        generateNotify(response.message, "warning");
-                    }
-                },
-                error: function (e) {
-                    console.log(e);
-        				$('#spinner').attr("class", "fa fa-times");
-                    generateNotify("Something went wrong!", "danger");
-                }
-            });
-        });
-
-
-    });
+@using PlexRequests.UI.Helpers
+@Html.Partial("_Sidebar")
+@{
+    int port;
+    if (Model.EmailPort == 0)
+    {
+        port = 25;
+    }
+    else
+    {
+        port = Model.EmailPort;
+    }
+}
+<div class="col-sm-8 col-sm-push-1">
+    <form class="form-horizontal" method="POST" id="mainForm">
+        <fieldset>
+            <legend>Email Notifications</legend>
+
+            <div class="form-group">
+                <div class="checkbox">
+                    
+                        @if (Model.Enabled)
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled" checked="checked"><label for="Enabled">Enabled</label>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled"><label for="Enabled">Enabled</label>
+                        }
+                
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="checkbox">
+
+                        @if (Model.EnableUserEmailNotifications)
+                        {
+                            <input type="checkbox" id="EnableUserEmailNotifications" name="EnableUserEmailNotifications" checked="checked"><label for="EnableUserEmailNotifications">Enable user email notifications</label>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="EnableUserEmailNotifications" name="EnableUserEmailNotifications"><label for="EnableUserEmailNotifications">Enable user email notifications</label>
+                        }
+         
+                </div>
+            </div>
+            <small>Please note that if user notifications is enabled, the email will get sent with the SMTP set-up below.</small>
+            <div class="form-group">
+                <label for="EmailHost" class="control-label">SMTP Host name or IP</label>
+                <div class="">
+                    <input type="text" class="form-control form-control-custom " id="EmailHost" name="EmailHost" placeholder="localhost" value="@Model.EmailHost">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="EmailPort" class="control-label">SMTP Port</label>
+
+                <div class="">
+                    <input type="text" class="form-control form-control-custom " id="EmailPort" name="EmailPort" placeholder="Port Number" value="@port">
+                </div>
+            </div>
+
+
+            <div class="form-group">
+                <label for="EmailSender" class="control-label">Email Sender</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="EmailSender" name="EmailSender" value="@Model.EmailSender">
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="RecipientEmail" class="control-label">Email Recipient</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="RecipientEmail" name="RecipientEmail" value="@Model.RecipientEmail">
+                </div>
+            </div>
+
+
+
+            <div class="form-group">
+                <label for="EmailUsername" class="control-label">Username</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="EmailUsername" name="EmailUsername" value="@Model.EmailUsername">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="EmailPassword" class="control-label">Password</label>
+                <div>
+                    <input type="password" class="form-control form-control-custom " id="EmailPassword" name="EmailPassword" value="@Model.EmailPassword">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div>
+                    <button id="testEmail" type="submit" class="btn btn-primary-outline">Test <div id="spinner"></div></button>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div>
+                    <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
+                </div>
+            </div>
+        </fieldset>
+    </form>
+</div>
+
+<script>
+    $(function () {
+
+        var base = '@Html.GetBaseUrl()';
+        $('#save').click(function (e) {
+            e.preventDefault();
+            var port = $('#EmailPort').val();
+            if (isNaN(port)) {
+                generateNotify("You must specify a valid Port.", "warning");
+                return;
+            }
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: $form.prop("action"),
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
+
+	        $('#testEmail').click(function (e) {
+	         	$('#spinner').attr("class", "fa fa-spinner fa-spin");
+
+            var url = createBaseUrl(base, '/admin/testemailnotification');
+            e.preventDefault();
+            var port = $('#EmailPort').val();
+            if (isNaN(port)) {
+                generateNotify("You must specify a valid Port.", "warning");
+                return;
+            }
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: url,
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+        				$('#spinner').attr("class", "fa fa-check");
+                        generateNotify(response.message, "success");
+                    } else {
+        				$('#spinner').attr("class", "fa fa-times");
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+        				$('#spinner').attr("class", "fa fa-times");
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
+
+
+    });
 </script>
\ No newline at end of file
diff --git a/PlexRequests.UI/packages.config b/PlexRequests.UI/packages.config
index 7be846f3b..0a0eeb62a 100644
--- a/PlexRequests.UI/packages.config
+++ b/PlexRequests.UI/packages.config
@@ -9,7 +9,6 @@
   <package id="FluentValidation" version="6.2.1.0" targetFramework="net45" />
   <package id="jQuery" version="1.9.1" targetFramework="net45" />
   <package id="MarkdownSharp" version="1.13.0.0" targetFramework="net45" />
-  <package id="MediatR" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
@@ -32,7 +31,6 @@
   <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
   <package id="Ninject" version="3.2.0.0" targetFramework="net45" />
   <package id="Ninject.Extensions.ChildKernel" version="3.2.0.0" targetFramework="net45" />
-  <package id="Ninject.Extensions.Conventions" version="3.2.0.0" targetFramework="net45" />
   <package id="NLog" version="4.3.4" targetFramework="net45" />
   <package id="NLog.Config" version="4.2.3" targetFramework="net45" />
   <package id="NLog.Schema" version="4.0.0" targetFramework="net45" />