diff --git a/data/iio-sensor-proxy.service.in b/data/iio-sensor-proxy.service.in
index c69e0db..e4b6e78 100644
--- a/data/iio-sensor-proxy.service.in
+++ b/data/iio-sensor-proxy.service.in
@@ -5,3 +5,5 @@ Description=IIO Sensor Proxy service
 Type=dbus
 BusName=net.hadess.SensorProxy
 ExecStart=@sbindir@/iio-sensor-proxy
+#Uncomment this to enable debug
+#Environment="G_MESSAGES_DEBUG=all"
diff --git a/src/iio-sensor-proxy.c b/src/iio-sensor-proxy.c
index c6b6b52..677f296 100644
--- a/src/iio-sensor-proxy.c
+++ b/src/iio-sensor-proxy.c
@@ -766,8 +766,6 @@ int main (int argc, char **argv)
 	const gchar * const subsystems[] = { "iio", "input", "platform", NULL };
 	guint i;
 
-	/* g_setenv ("G_MESSAGES_DEBUG", "all", TRUE); */
-
 	g_usleep (G_USEC_PER_SEC * 3);
 
 	data = g_new0 (SensorData, 1);