diff --git a/src/LightsManager.cpp b/src/LightsManager.cpp
index a3efcea899..b8df2329bb 100644
--- a/src/LightsManager.cpp
+++ b/src/LightsManager.cpp
@@ -15,7 +15,7 @@
 #include "CommonMetrics.h"
 #include "Style.h"
 
-const RString DEFAULT_LIGHTS_DRIVER = "PIUIO,SystemMessage,Export";
+const RString DEFAULT_LIGHTS_DRIVER = "SystemMessage,Export";
 static Preference<RString> g_sLightsDriver( "LightsDriver", "" ); // "" == DEFAULT_LIGHTS_DRIVER
 Preference<float>	g_fLightsFalloffSeconds( "LightsFalloffSeconds", 0.1f );
 Preference<float>	g_fLightsAheadSeconds( "LightsAheadSeconds", 0.05f );
diff --git a/src/arch/InputHandler/InputHandler_Linux_PIUIO.cpp b/src/arch/InputHandler/InputHandler_Linux_PIUIO.cpp
index 29680c2bd0..1febef3722 100644
--- a/src/arch/InputHandler/InputHandler_Linux_PIUIO.cpp
+++ b/src/arch/InputHandler/InputHandler_Linux_PIUIO.cpp
@@ -24,9 +24,7 @@ InputHandler_Linux_PIUIO::InputHandler_Linux_PIUIO()
 	fd = open( "/dev/piuio0", O_RDONLY );
 	if( fd < 0 )
 	{
-		/* As it happens, most people don't have one of these. Don't log this.
-		 * TODO: Log it if it's in the device list. - Colby */
-		//LOG->Warn( "Couldn't open PIUIO device: %s", strerror(errno) );
+		LOG->Warn( "Couldn't open PIUIO device: %s", strerror(errno) );
 		return;
 	}
 
diff --git a/src/arch/arch_default.h b/src/arch/arch_default.h
index 57193912d5..88e863fcfb 100644
--- a/src/arch/arch_default.h
+++ b/src/arch/arch_default.h
@@ -34,7 +34,7 @@
 #include "LoadingWindow/LoadingWindow_Gtk.h"
 #endif
 #if defined(LINUX)
-#define DEFAULT_INPUT_DRIVER_LIST "PIUIO,X11,Event,Joystick"
+#define DEFAULT_INPUT_DRIVER_LIST "X11,Event,Joystick"
 #else
 #define DEFAULT_INPUT_DRIVER_LIST "X11"
 #endif