diff --git a/QuickPlay.sln b/QuickPlay.sln
index 64c209c..539aa49 100644
--- a/QuickPlay.sln
+++ b/QuickPlay.sln
@@ -5,11 +5,9 @@ VisualStudioVersion = 16.0.31112.23
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickPlay", "QuickPlay\QuickPlay.csproj", "{FDBCCBF8-7CA5-4719-8CBB-8E33C464B27C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MpcNET", "..\..\Third-party\MpcNET\Source\MpcNET\MpcNET.csproj", "{9477D75F-2F50-41A8-A082-B43873FFE0B4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MpcCore", "..\..\Third-party\mpcCore\src\MpcCore\MpcCore.csproj", "{D0A5AD05-B98C-45E6-B61D-4700F7AA72CF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MPDConsoleTests", "..\MPDConsoleTests\MPDConsoleTests.csproj", "{8A1047BF-5D07-4242-9DB8-1D419B953E34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPDConsoleTests", "..\MPDConsoleTests\MPDConsoleTests.csproj", "{8A1047BF-5D07-4242-9DB8-1D419B953E34}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,12 +25,6 @@ Global
 		{FDBCCBF8-7CA5-4719-8CBB-8E33C464B27C}.Release-Stable|Any CPU.ActiveCfg = Release|Any CPU
 		{FDBCCBF8-7CA5-4719-8CBB-8E33C464B27C}.Release-Stable|Any CPU.Build.0 = Release|Any CPU
 		{FDBCCBF8-7CA5-4719-8CBB-8E33C464B27C}.Release-Stable|Any CPU.Deploy.0 = Release|Any CPU
-		{9477D75F-2F50-41A8-A082-B43873FFE0B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9477D75F-2F50-41A8-A082-B43873FFE0B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9477D75F-2F50-41A8-A082-B43873FFE0B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9477D75F-2F50-41A8-A082-B43873FFE0B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9477D75F-2F50-41A8-A082-B43873FFE0B4}.Release-Stable|Any CPU.ActiveCfg = Release-Stable|Any CPU
-		{9477D75F-2F50-41A8-A082-B43873FFE0B4}.Release-Stable|Any CPU.Build.0 = Release-Stable|Any CPU
 		{D0A5AD05-B98C-45E6-B61D-4700F7AA72CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0A5AD05-B98C-45E6-B61D-4700F7AA72CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0A5AD05-B98C-45E6-B61D-4700F7AA72CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/QuickPlay/Interfaces.cs b/QuickPlay/Interfaces.cs
index 858aa31..acf3783 100644
--- a/QuickPlay/Interfaces.cs
+++ b/QuickPlay/Interfaces.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Android.Content;
 
 // MPD client abstractions and simplifications
 namespace QuickPlay
diff --git a/QuickPlay/LayoutStrategies.cs b/QuickPlay/LayoutStrategies.cs
index 9d9d8b4..728996f 100644
--- a/QuickPlay/LayoutStrategies.cs
+++ b/QuickPlay/LayoutStrategies.cs
@@ -1,10 +1,4 @@
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace QuickPlay
diff --git a/QuickPlay/MainActivity.cs b/QuickPlay/MainActivity.cs
index d456e0b..d371843 100644
--- a/QuickPlay/MainActivity.cs
+++ b/QuickPlay/MainActivity.cs
@@ -1,25 +1,12 @@
 using System;
 using Android.App;
 using Android.OS;
-//using Android.Runtime;
 using Android.Views;
 using Android.Widget;
-//using AndroidX.AppCompat.Widget;
-//using AndroidX.AppCompat.App;
-//using Google.Android.Material.FloatingActionButton;
-//using Google.Android.Material.Snackbar;
 using Android.Support.V7.App;
 using Toolbar = Android.Support.V7.Widget.Toolbar;
 using GridLayoutManager = Android.Support.V7.Widget.GridLayoutManager;
 
-using System.Net;
-//using MpcNET;
-//using MpcNET.Commands.Playback;
-//using MpcCore;
-//using MpcCore.Commands.Player;
-//using MpcCore.Response;
-using System.Collections.Generic;
-
 namespace QuickPlay
 {
     [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true)]
diff --git a/QuickPlay/MpdMonitorService.cs b/QuickPlay/MpdMonitorService.cs
index 3075524..641b80e 100644
--- a/QuickPlay/MpdMonitorService.cs
+++ b/QuickPlay/MpdMonitorService.cs
@@ -5,9 +5,6 @@ using Android.Runtime;
 using Android.Views;
 using Android.Widget;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace QuickPlay
 {  
diff --git a/QuickPlay/MpdPlayer.cs b/QuickPlay/MpdPlayer.cs
index 81197cc..8bbdad2 100644
--- a/QuickPlay/MpdPlayer.cs
+++ b/QuickPlay/MpdPlayer.cs
@@ -1,13 +1,7 @@
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
+using Android.Content;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using System.Threading;
 using MpcCore;
 using System.Net.Sockets;
 
diff --git a/QuickPlay/SongRecycler.cs b/QuickPlay/SongRecycler.cs
index 16adad4..bf27117 100644
--- a/QuickPlay/SongRecycler.cs
+++ b/QuickPlay/SongRecycler.cs
@@ -7,7 +7,6 @@ using Android.Views;
 using Android.Widget;
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace QuickPlay
 {