diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index b22041c63e..24ffed6da4 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -3275,7 +3275,6 @@
 			this.LinkConnectStatusBarButton.Size = new System.Drawing.Size(16, 17);
 			this.LinkConnectStatusBarButton.Text = "Link connection is currently enabled";
 			this.LinkConnectStatusBarButton.ToolTipText = "Link connection is currently enabled";
-			this.LinkConnectStatusBarButton.Click += new System.EventHandler(this.LinkConnectStatusBarButton_Click);
 			// 
 			// UpdateNotification
 			// 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 1fa92909dc..2839340073 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -4049,22 +4049,6 @@ namespace BizHawk.Client.EmuHawk
 
 		#endregion
 
-		private void LinkConnectStatusBarButton_Click(object sender, EventArgs e)
-		{
-			// TODO: it would be cool if clicking this toggled the state
-			if (Global.Emulator.CoreComm.LinkConnected == true)
-			{
-				//Disconnect
-				//This Value:  cablediscosignal_new  Changes to False, The Core will disconnect
-
-			}
-			else if (Global.Emulator.CoreComm.LinkConnected == false)
-			{
-				//Reconnect
-
-			}
-		}
-
 		private void FeaturesMenuItem_Click(object sender, EventArgs e)
 		{
 			GlobalWin.Tools.Load<CoreFeatureAnalysis>();
diff --git a/BizHawk.Emulation.Common/Base Implementations/NullSound.cs b/BizHawk.Emulation.Common/Base Implementations/NullSound.cs
index cae848d75c..689881d7e3 100644
--- a/BizHawk.Emulation.Common/Base Implementations/NullSound.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/NullSound.cs	
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace BizHawk.Emulation.Common
+namespace BizHawk.Emulation.Common
 {
 	public class NullSound : ISoundProvider
 	{
diff --git a/BizHawk.Emulation.Common/CoreComms.cs b/BizHawk.Emulation.Common/CoreComms.cs
index 88719a89b2..a757a59128 100644
--- a/BizHawk.Emulation.Common/CoreComms.cs
+++ b/BizHawk.Emulation.Common/CoreComms.cs
@@ -1,16 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace BizHawk.Emulation.Common
 {
 	public class CoreComm
 	{
-		public CoreComm(Action<string> ShowMessage, Action<string> NotifyMessage)
+		public CoreComm(Action<string> showMessage, Action<string> NotifyMessage)
 		{
-			this.ShowMessage = ShowMessage;
-			this.Notify = NotifyMessage;
+			ShowMessage = showMessage;
+			Notify = NotifyMessage;
 		}
 
 		public ICoreFileProvider CoreFileProvider;
@@ -22,6 +19,7 @@ namespace BizHawk.Emulation.Common
 				return VsyncNum / (double)VsyncDen;
 			}
 		}
+
 		public int VsyncNum = 60;
 		public int VsyncDen = 1;