diff -r 22b327842add -r d2295c186ce1 Server/MainForm.Hid.cs
--- a/Server/MainForm.Hid.cs	Sat Sep 26 11:56:49 2015 +0200
+++ b/Server/MainForm.Hid.cs	Sat Sep 26 16:35:27 2015 +0200
@@ -31,12 +31,6 @@
         /// </summary>
         private Hid.Handler iHidHandler;
 
-        ///
-        private PowerManager.SettingNotifier iPowerSettingNotifier;
-
-        ///
-        private Cec.Client iCecClient;
-
         /// <summary>
         /// Register HID devices so that we receive corresponding WM_INPUT messages.
         /// </summary>
@@ -98,30 +92,9 @@
             }
             iHidHandler.OnHidEvent += HandleHidEventThreadSafe;
 
-            //TODO: Move this some place else
-            iPowerSettingNotifier = new PowerManager.SettingNotifier(Handle);
-            iPowerSettingNotifier.OnMonitorPowerOn += MonitorPowerOn;
-            iPowerSettingNotifier.OnMonitorPowerOff += MonitorPowerOff;
-
-            //CEC
-            iCecClient = new Cec.Client();
-            if (!iCecClient.Connect(1000))
-            {
-                Debug.WriteLine("WARNING: No CEC connection!");
-            }
         }
 
-        void MonitorPowerOn()
-        {
-            Debug.WriteLine("ON");
-            iCecClient.PowerOnDevices(CecSharp.CecLogicalAddress.Tv);
-        }
 
-        void MonitorPowerOff()
-        {
-            Debug.WriteLine("OFF");
-            iCecClient.StandbyDevices(CecSharp.CecLogicalAddress.Tv);
-        }
 
 
         /// <summary>
@@ -428,6 +401,8 @@
                 SwitchToThisWindow(existingProcesses[0].MainWindowHandle, true);
             }            
         }
+
+
         /// <summary>
         /// We need to handle WM_INPUT.
         /// </summary>
@@ -443,13 +418,7 @@
                     break;
             }
 
-            //Hook in our power manager
-            if (iPowerSettingNotifier!=null)
-            {
-                iPowerSettingNotifier.WndProc(ref message);
-            }
-
-            //Is that needed? Check the docs.
+            //Pass this on to base class.
             base.WndProc(ref message);
         }
     }