diff --git a/armci/src/common/noncont.c b/armci/src/common/noncont.c
index 858e9a302..a0c9b5145 100644
--- a/armci/src/common/noncont.c
+++ b/armci/src/common/noncont.c
@@ -23,29 +23,15 @@
 #   include <stdio.h>
 #endif
 
-
-#if 0
-#   define PRN_DBG_MSG3(m,a1,a2,a3) \
-           fprintf(stderr,"DBG %d: " m,armci_me,a1,a2,a3);fflush(stderr)
-#   define PRN_DBG_MSG(m) PRN_DBG_MSG3(m,0,0,0)
-#   define PRN_DBG_MSG1(m,a1) PRN_DBG_MSG3(m,a1,0,0)
-#   define PRN_DBG_MSG2(m,a1,a2) PRN_DBG_MSG3(m,a1,a2,0)
-#else
 #   define PRN_DBG_MSG(m)
 #   define PRN_DBG_MSG1(m,a1)
 #   define PRN_DBG_MSG2(m,a1,a2)
 #   define PRN_DBG_MSG3(m,a1,a2,a3)
-#endif
 
-#if 0
-#   define CALL_IN(_func)  { if (armci_me == 0) printf("ENTERED %s\n", _func); fflush(stdout); }
-#   define CALL_OUT(_func) { if (armci_me == 0) printf("EXITING %s\n", _func); fflush(stdout); }
-#else
 #   define CALL_IN(_func)
 #   define CALL_OUT(_func)
-#endif
 
-#ifdef  NB_NONCONT
+#if defined(NB_NONCONT)
 
 #if defined(CRAY_SHMEM)
 typedef void *HTYPE;
diff --git a/armci/src/include/copy.h b/armci/src/include/copy.h
index bce8f81d3..48fb7b25f 100644
--- a/armci/src/include/copy.h
+++ b/armci/src/include/copy.h
@@ -133,7 +133,7 @@
 #   define armci_get2D(p, bytes, count, src_ptr,src_stride,dst_ptr,dst_stride)\
            CopyPatchFrom(src_ptr, src_stride, dst_ptr, dst_stride,count,bytes,p)
 
-#elif defined(HITACHI) || !defined(NB_NONCONT)
+#elif defined(HITACHI)
 
     extern void armcill_put2D(int proc, int bytes, int count,
                 void* src_ptr,int src_stride, void* dst_ptr,int dst_stride);