diff --git a/scripts/exwave_init.sh b/scripts/exwave_init.sh
index 67f20347fa..677f90eeb4 100755
--- a/scripts/exwave_init.sh
+++ b/scripts/exwave_init.sh
@@ -36,10 +36,10 @@
 
   msg="HAS BEGUN on `hostname`"
   postmsg "$msg"
-  echo $msg
+
   msg="Starting MWW3 INIT CONFIG SCRIPT for $COMPONENTwave"
   postmsg "$msg"
-  echo $msg
+
 
   set +x
   echo ' '
@@ -119,7 +119,7 @@
       else
         msg="ABNORMAL EXIT: NO INP FILE FOR MODEL DEFINITION FILE"
         postmsg "$msg"
-        echo $msg
+
         set +x
         echo ' '
         echo '*********************************************************** '
@@ -168,8 +168,7 @@
   
     if [ "$NTASKS" -gt '1' ]
     then
-      #${wavempexec} ${wavenproc} ${wave_mpmd} cmdfile
-      ${wavempexec} ${wave_mpmd} cmdfile #${wavenproc} ${wave_mpmd} cmdfile
+      ${wavempexec} ${wave_mpmd} cmdfile
       exit=$?
     else
       ./cmdfile
@@ -204,7 +203,7 @@
     else 
       msg="ABNORMAL EXIT: NO MODEL DEFINITION FILE"
       postmsg "$msg"
-      echo $msg
+
       set +x
       echo ' '
       echo '********************************************** '
@@ -234,6 +233,6 @@
 
   msg="$job completed normally"
   postmsg "$msg"
-  echo $msg
+
 
 # End of MWW3 init config script ------------------------------------------- #
diff --git a/scripts/exwave_post_sbs.sh b/scripts/exwave_post_sbs.sh
index c4cd0ce5bb..1be85a7c6c 100755
--- a/scripts/exwave_post_sbs.sh
+++ b/scripts/exwave_post_sbs.sh
@@ -679,7 +679,6 @@
 
     if [ "$wavenproc" -gt '1' ]
     then
-      #${wavempexec} ${wavenproc} ${wave_mpmd} ${fcmdnow}
       ${wavempexec} ${wave_mpmd} ${fcmdnow}
       exit=$?
     else
@@ -788,7 +787,6 @@
 
     if [ "$wavenproc" -gt '1' ]
     then
-      #${wavempexec} ${wavenproc} ${wave_mpmd} cmdtarfile
       ${wavempexec} ${wave_mpmd} cmdtarfile
       exit=$?
     else
diff --git a/scripts/exwave_prep.sh b/scripts/exwave_prep.sh
index 0862c1d305..5dafed7425 100755
--- a/scripts/exwave_prep.sh
+++ b/scripts/exwave_prep.sh
@@ -337,7 +337,6 @@
   
       if [ "$wavenproc" -gt '1' ]
       then
-        #${wavempexec} ${wavenproc} ${wave_mpmd} cmdfile
         ${wavempexec} ${wave_mpmd} cmdfile
         exit=$?
       else
@@ -705,7 +704,6 @@
 
       if [ $wavenproc -gt '1' ]
       then
-        #${wavempexec} ${wavenproc} ${wave_mpmd} cmdfile
         ${wavempexec} ${wave_mpmd} cmdfile
         exit=$?
       else
diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh
index 9df31b030e..7ad0281bc6 100644
--- a/sorc/machine-setup.sh
+++ b/sorc/machine-setup.sh
@@ -196,13 +196,7 @@ elif [[ -d /apps/prod ]]; then
     target=wcoss2
 
     module purge
-    #module use -a /apps/prod/modules
-    # For gefs_nemsio2nc
-    #module use /lfs/h1/ops/prod/libs/modulefiles/stack
-    #module load hpc
-    #module load hpc-intel
-    #module load hpc-cray-mpich
-    module load envvar/1.0
+    module load envvar/${envvar_ver:-1.0}
 
 else
     echo WARNING: UNKNOWN PLATFORM 1>&2
diff --git a/ush/wave_grid_moddef.sh b/ush/wave_grid_moddef.sh
index 8a28d2302e..94f2cbc775 100755
--- a/ush/wave_grid_moddef.sh
+++ b/ush/wave_grid_moddef.sh
@@ -29,7 +29,6 @@
   [[ "$LOUD" != YES ]] && set +x
 
   postmsg "Generating mod_def file"
-  echo "Generating mod_def file"
 
   mkdir -p moddef_${1}
   cd moddef_${1}
@@ -57,7 +56,6 @@
     echo ' '
     [[ "$LOUD" = YES ]] && set -x
     postmsg "GRID IN ww3_mod_def.sh NOT SET"
-    echo "GRID IN ww3_mod_def.sh NOT SET"
 
     exit 1
   else
@@ -77,7 +75,6 @@
     echo ' '
     [[ "$LOUD" = YES ]] && set -x
     postmsg "EXPORTED VARIABLES IN ww3_mod_def.sh NOT SET"
-    echo "EXPORTED VARIABLES IN ww3_mod_def.sh NOT SET"
     exit 2
   fi
 
@@ -107,7 +104,6 @@
     echo ' '
     [[ "$LOUD" = YES ]] && set -x
     postmsg "FATAL ERROR : ERROR IN ww3_grid"
-    echo "FATAL ERROR : ERROR IN ww3_grid"
     exit 3
   fi
  
@@ -124,7 +120,6 @@
     echo ' '
     [[ "$LOUD" = YES ]] && set -x
     postmsg "FATAL ERROR : Mod def File creation FAILED"
-    echo "FATAL ERROR : Mod def File creation FAILED"
     exit 4
   fi