diff --git a/examples/C/Makefile.am b/examples/C/Makefile.am
index 7b5d0e4f9e..38fbed42d3 100644
--- a/examples/C/Makefile.am
+++ b/examples/C/Makefile.am
@@ -6,10 +6,10 @@
 # Ed Hartnett, Ward Fisher, Dennis Heimbigner
 
 # Un comment to use a more verbose test driver
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
-sh_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
-LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
-TESTS_ENVIRONMENT = export SETX=1;
+#SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
+#sh_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
+#LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose
+#TESTS_ENVIRONMENT = export SETX=1;
 
 # Put together AM_CPPFLAGS and AM_LDFLAGS.
 include $(top_srcdir)/lib_flags.am
diff --git a/examples/C/run_filter.sh b/examples/C/run_filter.sh
index c481f66575..d87b60813c 100755
--- a/examples/C/run_filter.sh
+++ b/examples/C/run_filter.sh
@@ -11,7 +11,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 echo "*** Running filter example for netCDF-4."
 
-set -x
 set -e
 
 echo "*** running test_filter example..."
diff --git a/include/nc4internal.h b/include/nc4internal.h
index 09f3f20c7b..5bb1dea157 100644
--- a/include/nc4internal.h
+++ b/include/nc4internal.h
@@ -462,9 +462,6 @@ extern int nc_get_alignment(int* thresholdp, int* alignmentp);
 /**************************************************/
 /* Begin to collect global state info in one place (more to do) */
 
-#define PLUGINPATHS gs->pluginpaths
-#define ZPLUGINPATHS gs->zarr.pluginpaths
-
 typedef struct NCglobalstate {
     int initialized;
     char* tempdir; /* track a usable temp dir */
diff --git a/libnczarr/zdebug.h b/libnczarr/zdebug.h
index d4a8d192c4..8f964ba32c 100644
--- a/libnczarr/zdebug.h
+++ b/libnczarr/zdebug.h
@@ -5,7 +5,7 @@
 #ifndef ZDEBUG_H
 #define ZDEBUG_H
 
-#define ZCATCH /* Warning: significant performance impact */
+#undef ZCATCH /* Warning: significant performance impact */
 #undef ZTRACING /* Warning: significant performance impact */
 
 #undef ZDEBUG /* general debug */
diff --git a/ncdump/tst_nccopy4.sh b/ncdump/tst_nccopy4.sh
index a59426f251..07521da73e 100755
--- a/ncdump/tst_nccopy4.sh
+++ b/ncdump/tst_nccopy4.sh
@@ -9,7 +9,6 @@ isolate "testdir_nccopy4"
 THISDIR=`pwd`
 cd $ISOPATH
 
-set -x
 set -e
 
 # For a netCDF-4 build, test nccopy on netCDF files in this directory
diff --git a/nczarr_test/run_nan.sh b/nczarr_test/run_nan.sh
index 0afa410cba..e80f2955d9 100755
--- a/nczarr_test/run_nan.sh
+++ b/nczarr_test/run_nan.sh
@@ -15,8 +15,6 @@ s3isolate "testdir_nan"
 THISDIR=`pwd`
 cd $ISOPATH
 
-set -x
-export SETX=1
 set -e
 
 # Location constants
diff --git a/nczarr_test/run_purezarr.sh b/nczarr_test/run_purezarr.sh
index 9d4545deb4..efe177468c 100755
--- a/nczarr_test/run_purezarr.sh
+++ b/nczarr_test/run_purezarr.sh
@@ -5,7 +5,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 . "${srcdir}/test_nczarr.sh"
 
-set -x
 set -e
 
 s3isolate "testdir_purezarr"
diff --git a/v3_nczarr_test/run_filter.sh b/v3_nczarr_test/run_filter.sh
index 7f042913b4..20eaba526d 100755
--- a/v3_nczarr_test/run_filter.sh
+++ b/v3_nczarr_test/run_filter.sh
@@ -5,7 +5,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 . "${srcdir}/test_nczarr.sh"
 
-set -x
 set -e
 
 s3isolate "testdir_filter"
diff --git a/v3_nczarr_test/run_interop.sh b/v3_nczarr_test/run_interop.sh
index c50607b22d..6cdbf8c5d9 100755
--- a/v3_nczarr_test/run_interop.sh
+++ b/v3_nczarr_test/run_interop.sh
@@ -5,7 +5,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 . "${srcdir}/test_nczarr.sh"
 
-set -x
 set -e
 
 metaonly="-h"
diff --git a/v3_nczarr_test/run_misc.sh b/v3_nczarr_test/run_misc.sh
index e1c68320ef..feb4c26f5d 100755
--- a/v3_nczarr_test/run_misc.sh
+++ b/v3_nczarr_test/run_misc.sh
@@ -5,7 +5,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 . "${srcdir}/test_nczarr.sh"
 
-set -x
 set -e
 
 s3isolate "testdir_misc"
diff --git a/v3_nczarr_test/run_nan.sh b/v3_nczarr_test/run_nan.sh
index 4e0b581b17..f59ded80c7 100755
--- a/v3_nczarr_test/run_nan.sh
+++ b/v3_nczarr_test/run_nan.sh
@@ -15,7 +15,6 @@ s3isolate "testdir_nan"
 THISDIR=`pwd`
 cd $ISOPATH
 
-set -x
 set -e
 
 # Functions
diff --git a/v3_nczarr_test/run_nczarr_fill.sh b/v3_nczarr_test/run_nczarr_fill.sh
index 3fb0f59da3..0024e5decf 100755
--- a/v3_nczarr_test/run_nczarr_fill.sh
+++ b/v3_nczarr_test/run_nczarr_fill.sh
@@ -9,7 +9,6 @@ s3isolate "testdir_nczarr_fill"
 THISDIR=`pwd`
 cd $ISOPATH
 
-set -x
 set -e
 
 echo "*** Test: Github issues #2063, #2062, #2059"
diff --git a/v3_nczarr_test/run_nulls.sh b/v3_nczarr_test/run_nulls.sh
index 92e7164b20..0df59554dc 100755
--- a/v3_nczarr_test/run_nulls.sh
+++ b/v3_nczarr_test/run_nulls.sh
@@ -5,7 +5,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 . "${srcdir}/test_nczarr.sh"
 
-set -x
 set -e
 
 s3isolate "testdir_nulls"
diff --git a/v3_nczarr_test/run_purezarr.sh b/v3_nczarr_test/run_purezarr.sh
index 9d4545deb4..efe177468c 100755
--- a/v3_nczarr_test/run_purezarr.sh
+++ b/v3_nczarr_test/run_purezarr.sh
@@ -5,7 +5,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 . "${srcdir}/test_nczarr.sh"
 
-set -x
 set -e
 
 s3isolate "testdir_purezarr"
diff --git a/v3_nczarr_test/run_strings.sh b/v3_nczarr_test/run_strings.sh
index a18c72550f..e27248afba 100755
--- a/v3_nczarr_test/run_strings.sh
+++ b/v3_nczarr_test/run_strings.sh
@@ -7,7 +7,6 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 # This shell script tests support for the NC_STRING type
 
-set -x
 set -e
 
 s3isolate "testdir_strings"
diff --git a/v3_nczarr_test/run_ut_map.sh b/v3_nczarr_test/run_ut_map.sh
index a6023e96c4..312f117600 100755
--- a/v3_nczarr_test/run_ut_map.sh
+++ b/v3_nczarr_test/run_ut_map.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-export SETX=1
-
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh