diff --git a/iscsi-scst/kernel/Makefile b/iscsi-scst/kernel/Makefile
index 8da6dd881..1208e45d7 100644
--- a/iscsi-scst/kernel/Makefile
+++ b/iscsi-scst/kernel/Makefile
@@ -23,9 +23,9 @@
 EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR)
 EXTRA_CFLAGS += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
 
-EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
-#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
+#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
+EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
 
 #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES
 
diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile
index 416649e0a..5f43f98ca 100644
--- a/qla2x00t/qla2x00-target/Makefile
+++ b/qla2x00t/qla2x00-target/Makefile
@@ -37,9 +37,9 @@ INSTALL_DIR := /lib/modules/$(shell uname -r)/extra
 
 EXTRA_CFLAGS += -W -Wno-unused-parameter -Wno-missing-field-initializers
 
-EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS 
-#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
+#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS 
+EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
 #EXTRA_CFLAGS += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
 
 ifeq ($(KVER),)
diff --git a/qla_isp/linux/isp_pci.c b/qla_isp/linux/isp_pci.c
index 3bffdb23e..d44f0bbdd 100644
--- a/qla_isp/linux/isp_pci.c
+++ b/qla_isp/linux/isp_pci.c
@@ -536,10 +536,7 @@ isplinux_pci_init_one(struct Scsi_Host *host)
     if (isp_debug) {
         isp->isp_dblev = isp_debug;
     } else {
-        isp->isp_dblev = ISP_LOGCONFIG|ISP_LOGINFO|ISP_LOGWARN|ISP_LOGERR;
-#ifdef  ISP_TARGET_MODE
-        isp->isp_dblev |= ISP_LOGTINFO;
-#endif
+        isp->isp_dblev = ISP_LOGERR;
     }
 
     pci_read_config_word(pdev, PCI_COMMAND, &cmd);
diff --git a/qla_isp/linux/isp_scst.c b/qla_isp/linux/isp_scst.c
index 87449d5f8..4f1686e5f 100644
--- a/qla_isp/linux/isp_scst.c
+++ b/qla_isp/linux/isp_scst.c
@@ -156,7 +156,7 @@ struct bus {
     struct scst_proc_data    proc_data;
 };
 
-#define DEBUG 1
+//#define DEBUG 1
 
 #ifdef DEBUG
 #define    SDprintk     if (debug) printk
diff --git a/scst/src/Makefile b/scst/src/Makefile
index 42b63e769..26a6e2fc8 100644
--- a/scst/src/Makefile
+++ b/scst/src/Makefile
@@ -117,7 +117,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter \
 
 #EXTRA_CFLAGS += -DCONFIG_SCST_STRICT_SERIALIZING
 
-EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
+#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
 
 #EXTRA_CFLAGS += -DCONFIG_SCST_USE_EXPECTED_VALUES
 #EXTRA_CFLAGS += -DALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ
@@ -125,9 +125,9 @@ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
 
 #EXTRA_CFLAGS += -fno-inline
 
-#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
+EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
 
-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
 #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_TM -DCONFIG_SCST_TM_DBG_GO_OFFLINE
 #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_RETRY
 #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_OOM
diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile
index fd87ff80b..bb9ea8c24 100644
--- a/scst/src/dev_handlers/Makefile
+++ b/scst/src/dev_handlers/Makefile
@@ -70,10 +70,10 @@ endif
 EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter \
 		-Wno-missing-field-initializers
 
-EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
+#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
 
-#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
+EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
 
 clean:
 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \
diff --git a/usr/fileio/Makefile b/usr/fileio/Makefile
index 9928402fe..69ede1b4d 100644
--- a/usr/fileio/Makefile
+++ b/usr/fileio/Makefile
@@ -30,9 +30,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter -Wstrict-prototypes \
 PROGS = fileio_tgt
 LIBS = -lpthread
 
-CFLAGS += -DEXTRACHECKS
-#CFLAGS += -DTRACING
-CFLAGS += -DDEBUG -g -W -Wno-unused-parameter
+#CFLAGS += -DEXTRACHECKS
+CFLAGS += -DTRACING
+#CFLAGS += -DDEBUG -g -W -Wno-unused-parameter
 
 #CFLAGS += -DDEBUG_NOMEM
 #CFLAGS += -DDEBUG_SENSE