diff --git a/src/system/kernel/device_manager/driver_loader.c b/src/system/kernel/device_manager/driver_loader.c
index f2f984d754..c5b29291fd 100644
--- a/src/system/kernel/device_manager/driver_loader.c
+++ b/src/system/kernel/device_manager/driver_loader.c
@@ -19,7 +19,7 @@
 #include <string.h>
 
 
-#define TRACE_DRIVER_LOADER
+//#define TRACE_DRIVER_LOADER
 #ifdef TRACE_DRIVER_LOADER
 #	define TRACE(x) dprintf x
 #else
diff --git a/src/system/kernel/device_manager/nodes.c b/src/system/kernel/device_manager/nodes.c
index eb251e6548..5eb629e405 100644
--- a/src/system/kernel/device_manager/nodes.c
+++ b/src/system/kernel/device_manager/nodes.c
@@ -31,7 +31,7 @@
 #include <string.h>
 
 
-#define TRACE_NODES
+//#define TRACE_NODES
 #ifdef TRACE_NODES
 #	define TRACE(x) dprintf x
 #else
diff --git a/src/system/kernel/device_manager/probe.cpp b/src/system/kernel/device_manager/probe.cpp
index dcac6d4ba0..b5e4032393 100644
--- a/src/system/kernel/device_manager/probe.cpp
+++ b/src/system/kernel/device_manager/probe.cpp
@@ -31,7 +31,7 @@
 #include <string.h>
 
 
-#define TRACE_PROBE
+//#define TRACE_PROBE
 #ifdef TRACE_PROBE
 #	define TRACE(x) dprintf x
 #else
@@ -1120,8 +1120,10 @@ get_nodes_for_device_type(device_node_info *node, struct list *list, const char
 	}
 
 	if (matches) {
+#ifdef TRACE_PROBE
 		dprintf("** NODE MATCHES TYPE %s\n", type);
 		dm_dump_node(node, 0);
+#endif
 		return add_device_node(list, node);
 	}
 
diff --git a/src/system/kernel/device_manager/registration.c b/src/system/kernel/device_manager/registration.c
index c33b3db089..baefc86502 100644
--- a/src/system/kernel/device_manager/registration.c
+++ b/src/system/kernel/device_manager/registration.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 
-#define TRACE_REGISTRATION
+//#define TRACE_REGISTRATION
 #ifdef TRACE_REGISTRATION
 #	define TRACE(x) dprintf x
 #else
diff --git a/src/system/kernel/device_manager/scan.c b/src/system/kernel/device_manager/scan.c
index b6d7addcd0..983d80464c 100644
--- a/src/system/kernel/device_manager/scan.c
+++ b/src/system/kernel/device_manager/scan.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 
-#define TRACE_SCAN
+//#define TRACE_SCAN
 #ifdef TRACE_SCAN
 #	define TRACE(x) dprintf x
 #else