diff --git a/src/joypad.cpp b/src/joypad.cpp
index e387654..5232351 100644
--- a/src/joypad.cpp
+++ b/src/joypad.cpp
@@ -49,7 +49,7 @@ void JoyPad::resetToDev(int dev ) {
     read_struct.events = POLLIN;
     char buf[10];
     while(poll(&read_struct, 1, 5)!=0) {
-        printf("reading junk data\n");
+        DEBUG("reading junk data\n");
         read(joydev, buf, 10);
     }
     setupJoyDeviceListener(dev);
@@ -226,13 +226,13 @@ void JoyPad::jsevent( js_event msg ) {
     //otherwise, lets create us a fake event! Pass on the event to whichever
     //Button or Axis was pressed and let them decide what to do with it.
     if (msg.type & JS_EVENT_AXIS) {
-        printf("DEBUG: passing on an axis event\n");
-        printf("DEBUG: %d %d\n", msg.number, msg.value);
+        //printf("DEBUG: passing on an axis event\n");
+        //printf("DEBUG: %d %d\n", msg.number, msg.value);
         Axes[msg.number]->jsevent(msg.value);
     }
     else {
-        printf("DEBUG: passing on a button event\n");
-        printf("DEBUG: %d %d\n", msg.number, msg.value);
+        //printf("DEBUG: passing on a button event\n");
+        //printf("DEBUG: %d %d\n", msg.number, msg.value);
         Buttons[msg.number]->jsevent(msg.value);
     }
 }
diff --git a/src/layout.cpp b/src/layout.cpp
index 6451a7f..99c858b 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -265,7 +265,6 @@ void LayoutManager::trayClick() {
 void LayoutManager::trayMenu(QAction *menuItemAction) {
     //if they clicked on a Layout name, load it!
     //note that the other options are handled with their own special functions
-    printf("%s\n", qPrintable(menuItemAction->text()));
     if (Popup->actions().indexOf(menuItemAction) > 1 && menuItemAction->text() != "Quit" &&
         menuItemAction->text() != "Update lyaout list" &&
         menuItemAction->text() != "Update joystick devices") {
@@ -353,7 +352,7 @@ void LayoutManager::updateJoyDevs() {
                 read_struct.events = POLLIN;
                 char buf[10];
                 while(poll(&read_struct, 1, 5)!=0) {
-                    printf("reading junk data\n");
+                    DEBUG("reading junk data\n");
                     read(joydev, buf, 10);
                 }
                 joypad = new JoyPad( index, joydev );
@@ -368,7 +367,7 @@ void LayoutManager::updateJoyDevs() {
         }
         else {
             int errsv = errno;
-            printf("%s\n", strerror(errsv));
+            printf("error reading joypad dev device: %s\n", strerror(errsv));
         }
     }
     //when it's all done, rebuild the popup menu so it displays the correct
diff --git a/src/layout_edit.cpp b/src/layout_edit.cpp
index 1852e1f..f58c5a8 100644
--- a/src/layout_edit.cpp
+++ b/src/layout_edit.cpp
@@ -118,9 +118,9 @@ void LayoutEdit::windowActivationChange( bool oldActive ) {
     QHashIterator<int, JoyPad*> it( available );
     while (it.hasNext())
     {
-        printf("iterating and releasing\n");
+        DEBUG("iterating and releasing\n");
         it.next();
         it.value()->release();
     }
-    printf("done releasing!\n");
+    DEBUG("done releasing!\n");
 }