diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
index b7a29e15b0..67ac0fdb17 100644
--- a/ci/Jenkinsfile
+++ b/ci/Jenkinsfile
@@ -138,8 +138,14 @@ pipeline {
                                             }
                                         }
                                         try {
-                                            sh(script: "${HOMEgfs}/ci/scripts/utils/publish_logs.py --file ${error_logs} --repo PR_BUILD_${env.CHANGE_ID}")
-                                            gist_url=sh(script: "${HOMEgfs}/ci/scripts/utils/publish_logs.py --file ${error_logs} --gist PR_BUILD_${env.CHANGE_ID}", returnStdout: true).trim()
+                                            sh(script: """
+                                              source ${HOMEgfs}/workflow/gw_setup.sh
+                                              ${HOMEgfs}/ci/scripts/utils/publish_logs.py --file ${error_logs} --repo PR_BUILD_${env.CHANGE_ID}
+                                            """)
+                                            gist_url=sh(script: """
+                                              source ${HOMEgfs}/workflow/gw_setup.sh
+                                              ${HOMEgfs}/ci/scripts/utils/publish_logs.py --file ${error_logs} --gist PR_BUILD_${env.CHANGE_ID}
+                                            """, returnStdout: true).trim()
                                             sh(script:  """${GH} pr comment ${env.CHANGE_ID} --repo ${repo_url} --body "Build **FAILED** on **${Machine}** in Build# ${env.BUILD_NUMBER} with error logs:\n\\`\\`\\`\n${error_logs_message}\\`\\`\\`\n\nFollow link here to view the contents of the above file(s): [(link)](${gist_url})" """)
                                         } catch (Exception error_comment) {
                                             echo "Failed to comment on PR: ${error_comment.getMessage()}"
@@ -158,7 +164,10 @@ pipeline {
                                 }
                             }
                             // Get a list of CI cases to run
-                            CI_CASES = sh(script: "${HOMEgfs}/ci/scripts/utils/get_host_case_list.py ${machine}", returnStdout: true).trim().split()
+                            CI_CASES = sh(script: """
+                              source ${HOMEgfs}/workflow/gw_setup.sh
+                              ${HOMEgfs}/ci/scripts/utils/get_host_case_list.py ${machine}
+                            """, returnStdout: true).trim().split()
                             echo "Cases to run: ${CI_CASES}"
                         }
                     }
@@ -179,7 +188,10 @@ pipeline {
                                 script {
                                         env.RUNTESTS = "${CUSTOM_WORKSPACE}/RUNTESTS"
                                         try {
-                                              error_output = sh(script: "${HOMEgfs}/ci/scripts/utils/ci_utils_wrapper.sh create_experiment ${HOMEgfs}/ci/cases/pr/${caseName}.yaml", returnStdout: true).trim()
+                                              error_output = sh(script: """
+                                                source ${HOMEgfs}/workflow/gw_setup.sh
+                                                ${HOMEgfs}/ci/scripts/utils/ci_utils_wrapper.sh create_experiment ${HOMEgfs}/ci/cases/pr/${caseName}.yaml
+                                              """, returnStdout: true).trim()
                                         } catch (Exception error_create) {
                                             sh(script: """${GH} pr comment ${env.CHANGE_ID} --repo ${repo_url} --body "${Case} **FAILED** to create experiment on ${Machine} in BUILD# ${env.BUILD_NUMBER}\n with the error:\n\\`\\`\\`\n${error_output}\\`\\`\\`" """)
                                             error("Case ${caseName} failed to create experiment directory")
@@ -194,10 +206,19 @@ pipeline {
                                                 def error_file = "${CUSTOM_WORKSPACE}/RUNTESTS/${pslot}_error.logs"
                                                 sh(script: " rm -f ${error_file}")
                                                 try {
-                                                    sh(script: "${HOMEgfs}/ci/scripts/run-check_ci.sh ${CUSTOM_WORKSPACE} ${pslot} 'global-workflow'")
-                                                    sh(script: "${HOMEgfs}/ci/scripts/utils/ci_utils_wrapper.sh cleanup_experiment ${CUSTOM_WORKSPACE}/RUNTESTS/EXPDIR/${pslot}")
+                                                    sh(script: """
+                                                      source ${HOMEgfs}/workflow/gw_setup.sh
+                                                      ${HOMEgfs}/ci/scripts/run-check_ci.sh ${CUSTOM_WORKSPACE} ${pslot} 'global-workflow'
+                                                    """)
+                                                    sh(script: """
+                                                      source ${HOMEgfs}/workflow/gw_setup.sh
+                                                      ${HOMEgfs}/ci/scripts/utils/ci_utils_wrapper.sh cleanup_experiment ${CUSTOM_WORKSPACE}/RUNTESTS/EXPDIR/${pslot}
+                                                    """)
                                                 } catch (Exception error_experment) {
-                                                    sh(script: "${HOMEgfs}/ci/scripts/utils/ci_utils_wrapper.sh cancel_batch_jobs ${pslot}")
+                                                    sh(script: """
+                                                      source ${HOMEgfs}/workflow/gw_setup.sh
+                                                      ${HOMEgfs}/ci/scripts/utils/ci_utils_wrapper.sh cancel_batch_jobs ${pslot}
+                                                    """)
                                                     ws(CUSTOM_WORKSPACE) {
                                                         def error_logs = ""
                                                         def error_logs_message = ""
@@ -217,9 +238,15 @@ pipeline {
                                                                 }
                                                             }
                                                             try {
-                                                                gist_url = sh(script: "${HOMEgfs}/ci/scripts/utils/publish_logs.py --file ${error_logs} --gist PR_${env.CHANGE_ID}", returnStdout: true).trim()
+                                                                gist_url = sh(script: """
+                                                                  source ${HOMEgfs}/workflow/gw_setup.sh
+                                                                  ${HOMEgfs}/ci/scripts/utils/publish_logs.py --file ${error_logs} --gist PR_${env.CHANGE_ID}
+                                                                """, returnStdout: true).trim()
                                                                 sh(script: """${GH} pr comment ${env.CHANGE_ID} --repo ${repo_url} --body "Experiment ${caseName} **FAILED** on ${Machine} in Build# ${env.BUILD_NUMBER} with error logs:\n\\`\\`\\`\n${error_logs_message}\\`\\`\\`\n\nFollow link here to view the contents of the above file(s): [(link)](${gist_url})" """)
-                                                                sh(script: "${HOMEgfs}/ci/scripts/utils/publish_logs.py --file ${error_logs} --repo PR_${env.CHANGE_ID}")
+                                                                sh(script: """
+                                                                  source ${HOMEgfs}/workflow/gw_setup.sh
+                                                                  ${HOMEgfs}/ci/scripts/utils/publish_logs.py --file ${error_logs} --repo PR_${env.CHANGE_ID}
+                                                                """)
                                                             } catch (Exception error_comment) {
                                                                 echo "Failed to comment on PR: ${error_comment.getMessage()}"
                                                             }
diff --git a/ci/scripts/utils/launch_java_agent.sh b/ci/scripts/utils/launch_java_agent.sh
index eb78d3b1ef..ad79a75cbd 100755
--- a/ci/scripts/utils/launch_java_agent.sh
+++ b/ci/scripts/utils/launch_java_agent.sh
@@ -65,14 +65,14 @@ controller_url="https://jenkins.epic.oarcloud.noaa.gov"
 controller_user=${controller_user:-"terry.mcguinness"}
 controller_user_auth_token="jenkins_token"
 
-HOMEgfs="$(cd "$(dirname  "${BASH_SOURCE[0]}")/../../.." >/dev/null 2>&1 && pwd )"
+HOMEGFS_="$(cd "$(dirname  "${BASH_SOURCE[0]}")/../../.." >/dev/null 2>&1 && pwd )"
 host=$(hostname)
 
 #########################################################################
 #  Set up runtime environment varibles for accounts on supproted machines
 #########################################################################
 
-source "${HOMEgfs}/ush/detect_machine.sh"
+source "${HOMEGFS_}/ush/detect_machine.sh"
 case ${MACHINE_ID} in
   hera | orion | hercules | wcoss2 | gaea)
     echo "Launch Jenkins Java Controler on ${MACHINE_ID}";;
@@ -84,10 +84,10 @@ esac
 LOG=lanuched_agent-$(date +%Y%m%d%M).log
 rm -f "${LOG}"
 
-source "${HOMEgfs}/ush/module-setup.sh"
-module use "${HOMEgfs}/modulefiles"
+source "${HOMEGFS_}/ush/module-setup.sh"
+module use "${HOMEGFS_}/modulefiles"
 module load "module_gwsetup.${MACHINE_ID}"
-source "${HOMEgfs}/ci/platforms/config.${MACHINE_ID}"
+source "${HOMEGFS_}/ci/platforms/config.${MACHINE_ID}"
 
 JAVA_HOME="${JENKINS_AGENT_LANUCH_DIR}/JAVA/jdk-17.0.10"
 if [[ ! -d "${JAVA_HOME}" ]]; then
@@ -102,9 +102,10 @@ JAVA="${JAVA_HOME}/bin/java"
 echo "JAVA VERSION: "
 ${JAVA} -version
 
-export GH="${HOME}/bin/gh"
-[[ -f "${GH}" ]] || echo "gh is not installed in ${HOME}/bin"
+GH=$(command -v gh || echo "${HOME}/bin/gh")
+[[ -f "${GH}" ]] || ( echo "ERROR: GitHub CLI (gh) not found. (exiting with error)"; exit 1 )
 ${GH} --version
+export GH
 
 check_mark=$("${GH}" auth status -t 2>&1 | grep "Token:" | awk '{print $1}') || true
 if [[ "${check_mark}" != "✓" ]]; then
diff --git a/parm/archive/enkf_restartb_grp.yaml.j2 b/parm/archive/enkf_restartb_grp.yaml.j2
index 50595a6bbf..bf5656bf8c 100644
--- a/parm/archive/enkf_restartb_grp.yaml.j2
+++ b/parm/archive/enkf_restartb_grp.yaml.j2
@@ -38,5 +38,5 @@ enkf_restartb_grp:
         - "{{ COMIN_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.coupler.res"
         - "{{ COMIN_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.fv_core.res.nc"
         {% endfor %}
-        {% endfor %}
         {% endif %}
+        {% endfor %}
diff --git a/parm/config/gefs/config.wave b/parm/config/gefs/config.wave
index 6a1529274a..be37e7edb2 100644
--- a/parm/config/gefs/config.wave
+++ b/parm/config/gefs/config.wave
@@ -16,28 +16,10 @@ export RUNwave="${RUN}wave"
 export RUNRSTwave="gdas"
 
 #grid dependent variable defaults
-export waveGRDN='1'                   # grid number for ww3_multi
-export waveGRDG='10'                  # grid group for ww3_multi
-export USE_WAV_RMP='NO'               # YES/NO rmp grid remapping pre-processed coefficients
-export waveMULTIGRID='.false.'        # .true./.false. for multi or shel
 export MESH_WAV="mesh.${waveGRD}.nc"  # Mesh grid for wave model for CMEPS
-export waveesmfGRD=' '                # input grid for multigrid
 
 #Grid dependent variables for various grids
 case "${waveGRD}" in
-  "gnh_10m;aoc_9km;gsh_15m")
-    #GFSv16 settings:
-    export waveGRDN='1 2 3'
-    export waveGRDG='10 20 30'
-    export USE_WAV_RMP='YES'
-    export waveMULTIGRID='.true.'
-    export IOSRV='3'
-    export MESH_WAV=' '
-    export waveesmfGRD='glox_10m'
-    export waveuoutpGRD='points'
-    export waveinterpGRD='glo_15mxt at_10m ep_10m wc_10m glo_30m'
-    export wavepostGRD='gnh_10m aoc_9km gsh_15m'
-    ;;
   "gwes_30m")
     #Grid used for P8
     export waveinterpGRD=''
@@ -157,7 +139,7 @@ export WW3CURIENS='F'
 export GOFILETYPE=1     # GOFILETYPE=1 one gridded file per output step
 export POFILETYPE=1     # POFILETYPE=1 one point file per output step
 
-# Parameters for ww3_multi/shel.inp
+# Parameters for ww3_shel.inp
 # Unified output T or F
 export FUNIPNT='T'
 # Output server type (see ww3_shel/multi.inp in WW3 repo)
diff --git a/parm/config/gfs/config.wave b/parm/config/gfs/config.wave
index ea68508547..e792f45473 100644
--- a/parm/config/gfs/config.wave
+++ b/parm/config/gfs/config.wave
@@ -16,28 +16,10 @@ export RUNwave="${RUN}wave"
 export RUNRSTwave="gdas"
 
 #grid dependent variable defaults
-export waveGRDN='1'                   # grid number for ww3_multi
-export waveGRDG='10'                  # grid group for ww3_multi
-export USE_WAV_RMP='NO'               # YES/NO rmp grid remapping pre-processed coefficients
-export waveMULTIGRID='.false.'        # .true./.false. for multi or shel
 export MESH_WAV="mesh.${waveGRD}.nc"  # Mesh grid for wave model for CMEPS
-export waveesmfGRD=' '                # input grid for multigrid
 
 #Grid dependent variables for various grids
 case "${waveGRD}" in
-  "gnh_10m;aoc_9km;gsh_15m")
-    #GFSv16 settings:
-    export waveGRDN='1 2 3'
-    export waveGRDG='10 20 30'
-    export USE_WAV_RMP='YES'
-    export waveMULTIGRID='.true.'
-    export IOSRV='3'
-    export MESH_WAV=' '
-    export waveesmfGRD='glox_10m'
-    export waveuoutpGRD='points'
-    export waveinterpGRD='glo_15mxt at_10m ep_10m wc_10m glo_30m'
-    export wavepostGRD='gnh_10m aoc_9km gsh_15m'
-    ;;
   "gwes_30m")
     #Grid used for P8
     export waveinterpGRD=''
@@ -187,7 +169,7 @@ export WW3CURIENS='F'
 export GOFILETYPE=1     # GOFILETYPE=1 one gridded file per output step
 export POFILETYPE=1     # POFILETYPE=1 one point file per output step
 
-# Parameters for ww3_multi/shel.inp
+# Parameters for ww3_shel.inp
 # Unified output T or F
 export FUNIPNT='T'
 # Output server type (see ww3_shel/multi.inp in WW3 repo)
diff --git a/parm/wmo/grib2_awpgfs000.003 b/parm/wmo/grib2_awpgfs000.003
index 941ecf6e70..c3a317d241 100644
--- a/parm/wmo/grib2_awpgfs000.003
+++ b/parm/wmo/grib2_awpgfs000.003
@@ -104,4 +104,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPA92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPA92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPA92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPA50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 81 0 0 1 0 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs006.003 b/parm/wmo/grib2_awpgfs006.003
index 58fe211e0d..bdfeaab370 100644
--- a/parm/wmo/grib2_awpgfs006.003
+++ b/parm/wmo/grib2_awpgfs006.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPB92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 6 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPB92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 6 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPB92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 6 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPB50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 6 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs012.003 b/parm/wmo/grib2_awpgfs012.003
index 8c94bb7044..b367878e63 100644
--- a/parm/wmo/grib2_awpgfs012.003
+++ b/parm/wmo/grib2_awpgfs012.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPC92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 12 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPC92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 12 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPC92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 12 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPC50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 12 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs018.003 b/parm/wmo/grib2_awpgfs018.003
index 845f26a747..d89f2d2c73 100644
--- a/parm/wmo/grib2_awpgfs018.003
+++ b/parm/wmo/grib2_awpgfs018.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPD92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 18 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPD92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 18 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPD92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 18 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPD50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 18 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs024.003 b/parm/wmo/grib2_awpgfs024.003
index 56eadc6903..e446f48766 100644
--- a/parm/wmo/grib2_awpgfs024.003
+++ b/parm/wmo/grib2_awpgfs024.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPE92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 24 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPE92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 24 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPE92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 24 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPE50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 24 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs030.003 b/parm/wmo/grib2_awpgfs030.003
index d2d37c03b0..59081135d7 100644
--- a/parm/wmo/grib2_awpgfs030.003
+++ b/parm/wmo/grib2_awpgfs030.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPF92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 30 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPF92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 30 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPF92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 30 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPF50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 30 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs036.003 b/parm/wmo/grib2_awpgfs036.003
index 7cbe4d0aaf..4c18e96a12 100644
--- a/parm/wmo/grib2_awpgfs036.003
+++ b/parm/wmo/grib2_awpgfs036.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPG92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 36 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPG92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 36 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPG92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 36 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPG50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 36 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs042.003 b/parm/wmo/grib2_awpgfs042.003
index 1be18748b3..ad2a74b711 100644
--- a/parm/wmo/grib2_awpgfs042.003
+++ b/parm/wmo/grib2_awpgfs042.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPH92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 42 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPH92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 42 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPH92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 42 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPH50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 42 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs048.003 b/parm/wmo/grib2_awpgfs048.003
index d5fce80054..131398d546 100644
--- a/parm/wmo/grib2_awpgfs048.003
+++ b/parm/wmo/grib2_awpgfs048.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPI92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 48 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPI92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 48 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPI92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 48 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPI50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 48 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs054.003 b/parm/wmo/grib2_awpgfs054.003
index 92069b8110..1fa69592ea 100644
--- a/parm/wmo/grib2_awpgfs054.003
+++ b/parm/wmo/grib2_awpgfs054.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPM92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 54 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPM92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 54 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPM92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 54 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPM50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 54 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs060.003 b/parm/wmo/grib2_awpgfs060.003
index 6c5d7edf6c..a6bfd58475 100644
--- a/parm/wmo/grib2_awpgfs060.003
+++ b/parm/wmo/grib2_awpgfs060.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPJ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 60 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPJ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 60 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPJ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 60 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPJ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 60 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs066.003 b/parm/wmo/grib2_awpgfs066.003
index d322d35665..546db96456 100644
--- a/parm/wmo/grib2_awpgfs066.003
+++ b/parm/wmo/grib2_awpgfs066.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPN92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 66 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPN92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 66 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPN92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 66 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPN50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 66 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs072.003 b/parm/wmo/grib2_awpgfs072.003
index 3a7a4c48d8..fbab37a632 100644
--- a/parm/wmo/grib2_awpgfs072.003
+++ b/parm/wmo/grib2_awpgfs072.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPK92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 72 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPK92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 72 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPK92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 72 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPK50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 72 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs078.003 b/parm/wmo/grib2_awpgfs078.003
index 3556e82380..3b94cf4346 100644
--- a/parm/wmo/grib2_awpgfs078.003
+++ b/parm/wmo/grib2_awpgfs078.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPT92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 78 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPT92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 78 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPT92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 78 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPT50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 78 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs084.003 b/parm/wmo/grib2_awpgfs084.003
index 3f3d88eab2..20777aee0f 100644
--- a/parm/wmo/grib2_awpgfs084.003
+++ b/parm/wmo/grib2_awpgfs084.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPL92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 84 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPL92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 84 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPL92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 84 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPL50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 84 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs090.003 b/parm/wmo/grib2_awpgfs090.003
index dc606a19b2..8e1709bbf3 100644
--- a/parm/wmo/grib2_awpgfs090.003
+++ b/parm/wmo/grib2_awpgfs090.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPU92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 90 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPU92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 90 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPU92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 90 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPU50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 90 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs096.003 b/parm/wmo/grib2_awpgfs096.003
index 02adbff282..95e7388125 100644
--- a/parm/wmo/grib2_awpgfs096.003
+++ b/parm/wmo/grib2_awpgfs096.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPM92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 96 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPM92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 96 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPM92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 96 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPM50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 96 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs102.003 b/parm/wmo/grib2_awpgfs102.003
index 7cecc5b074..feab0338d4 100644
--- a/parm/wmo/grib2_awpgfs102.003
+++ b/parm/wmo/grib2_awpgfs102.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPV92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 102 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPV92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 102 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPV92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 102 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPV50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 102 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs108.003 b/parm/wmo/grib2_awpgfs108.003
index 492e984f97..aa2a66f3a7 100644
--- a/parm/wmo/grib2_awpgfs108.003
+++ b/parm/wmo/grib2_awpgfs108.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPN92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 108 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPN92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 108 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPN92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 108 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPN50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 108 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs114.003 b/parm/wmo/grib2_awpgfs114.003
index 181cb2e21e..5f7606ddf4 100644
--- a/parm/wmo/grib2_awpgfs114.003
+++ b/parm/wmo/grib2_awpgfs114.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPW92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 114 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPW92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 114 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPW92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 114 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPW50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 114 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs120.003 b/parm/wmo/grib2_awpgfs120.003
index 976ce08024..a42df185ea 100644
--- a/parm/wmo/grib2_awpgfs120.003
+++ b/parm/wmo/grib2_awpgfs120.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPO92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 120 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPO92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 120 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPO92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 120 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPO50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 120 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs126.003 b/parm/wmo/grib2_awpgfs126.003
index 23742cdaf5..8f3f91c909 100644
--- a/parm/wmo/grib2_awpgfs126.003
+++ b/parm/wmo/grib2_awpgfs126.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 126 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 126 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 126 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 126 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs132.003 b/parm/wmo/grib2_awpgfs132.003
index 0556a4bc19..dfa0a4e8f6 100644
--- a/parm/wmo/grib2_awpgfs132.003
+++ b/parm/wmo/grib2_awpgfs132.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPP92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 132 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPP92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 132 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPP92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 132 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPP50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 132 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs138.003 b/parm/wmo/grib2_awpgfs138.003
index 98a5813a3a..8835cbfc72 100644
--- a/parm/wmo/grib2_awpgfs138.003
+++ b/parm/wmo/grib2_awpgfs138.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 138 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 138 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 138 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 138 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs144.003 b/parm/wmo/grib2_awpgfs144.003
index ba83e0134a..1ac08b6b5a 100644
--- a/parm/wmo/grib2_awpgfs144.003
+++ b/parm/wmo/grib2_awpgfs144.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPQ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 144 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPQ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 144 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPQ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 144 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPQ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 144 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs150.003 b/parm/wmo/grib2_awpgfs150.003
index 67fce65ebd..b2162cced0 100644
--- a/parm/wmo/grib2_awpgfs150.003
+++ b/parm/wmo/grib2_awpgfs150.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 150 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 150 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 150 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 150 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs156.003 b/parm/wmo/grib2_awpgfs156.003
index 1ca86738dd..c357fb88cc 100644
--- a/parm/wmo/grib2_awpgfs156.003
+++ b/parm/wmo/grib2_awpgfs156.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPR92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 156 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPR92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 156 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPR92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 156 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPR50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 156 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs162.003 b/parm/wmo/grib2_awpgfs162.003
index 3f6efb6e22..3cafb1e7b8 100644
--- a/parm/wmo/grib2_awpgfs162.003
+++ b/parm/wmo/grib2_awpgfs162.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 162 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 162 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 162 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 162 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs168.003 b/parm/wmo/grib2_awpgfs168.003
index 2f9e5913d6..29c3278f35 100644
--- a/parm/wmo/grib2_awpgfs168.003
+++ b/parm/wmo/grib2_awpgfs168.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPS92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 168 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPS92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 168 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPS92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 168 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPS50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 168 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs174.003 b/parm/wmo/grib2_awpgfs174.003
index eb54a49f35..c6b9c97775 100644
--- a/parm/wmo/grib2_awpgfs174.003
+++ b/parm/wmo/grib2_awpgfs174.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 174 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 174 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 174 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 174 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs180.003 b/parm/wmo/grib2_awpgfs180.003
index 47670ca178..dce38df27f 100644
--- a/parm/wmo/grib2_awpgfs180.003
+++ b/parm/wmo/grib2_awpgfs180.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPT92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 180 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPT92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 180 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPT92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 180 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPT50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 180 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs186.003 b/parm/wmo/grib2_awpgfs186.003
index 10f3239a15..370b9ce6e8 100644
--- a/parm/wmo/grib2_awpgfs186.003
+++ b/parm/wmo/grib2_awpgfs186.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 186 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 186 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 186 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 186 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs192.003 b/parm/wmo/grib2_awpgfs192.003
index d3a9638d5e..0a5bd27aca 100644
--- a/parm/wmo/grib2_awpgfs192.003
+++ b/parm/wmo/grib2_awpgfs192.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPU92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 192 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPU92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 192 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPU92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 192 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPU50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 192 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs198.003 b/parm/wmo/grib2_awpgfs198.003
index 9b587fb043..87036abba8 100644
--- a/parm/wmo/grib2_awpgfs198.003
+++ b/parm/wmo/grib2_awpgfs198.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 198 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 198 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 198 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 198 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs204.003 b/parm/wmo/grib2_awpgfs204.003
index 38551e7392..abf45424ea 100644
--- a/parm/wmo/grib2_awpgfs204.003
+++ b/parm/wmo/grib2_awpgfs204.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPV92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 204 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPV92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 204 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPV92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 204 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPV50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 204 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs210.003 b/parm/wmo/grib2_awpgfs210.003
index 45d617ec9b..74791a663f 100644
--- a/parm/wmo/grib2_awpgfs210.003
+++ b/parm/wmo/grib2_awpgfs210.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 210 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 210 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 210 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 210 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs216.003 b/parm/wmo/grib2_awpgfs216.003
index 16de54e624..dca67d2056 100644
--- a/parm/wmo/grib2_awpgfs216.003
+++ b/parm/wmo/grib2_awpgfs216.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPW92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 216 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPW92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 216 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPW92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 216 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPW50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 216 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs222.003 b/parm/wmo/grib2_awpgfs222.003
index e0d027c13d..d96242c1cb 100644
--- a/parm/wmo/grib2_awpgfs222.003
+++ b/parm/wmo/grib2_awpgfs222.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 222 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 222 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 222 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 222 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs228.003 b/parm/wmo/grib2_awpgfs228.003
index 0309033c14..22e419660c 100644
--- a/parm/wmo/grib2_awpgfs228.003
+++ b/parm/wmo/grib2_awpgfs228.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPX92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 228 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPX92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 228 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPX92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 228 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPX50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 228 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs234.003 b/parm/wmo/grib2_awpgfs234.003
index 36df325d44..6a6a4a89d9 100644
--- a/parm/wmo/grib2_awpgfs234.003
+++ b/parm/wmo/grib2_awpgfs234.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 234 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 234 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 234 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 234 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs240.003 b/parm/wmo/grib2_awpgfs240.003
index b55f8d2194..4fe553764e 100644
--- a/parm/wmo/grib2_awpgfs240.003
+++ b/parm/wmo/grib2_awpgfs240.003
@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPY92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 240 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPY92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 240 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPY92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 240 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPY50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 240 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf000 b/parm/wmo/grib2_awpgfs_20km_akf000
index 10205f0c3a..d44d417e36 100644
--- a/parm/wmo/grib2_awpgfs_20km_akf000
+++ b/parm/wmo/grib2_awpgfs_20km_akf000
@@ -244,4 +244,3 @@
 &GRIBIDS DESC=' R H      2 m above ground ',WMOHEAD='YRBA98 KWBC',PDTN= 0 ,PDT=  1 1 2 0 81 0 0 1 0 103 0 2 255 0 0 /
 &GRIBIDS DESC=' U GRD    10 m above ground ',WMOHEAD='YUBA98 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 81 0 0 1 0 103 0 10 255 0 0 /
 &GRIBIDS DESC=' V GRD    10 m above ground ',WMOHEAD='YVBA98 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 81 0 0 1 0 103 0 10 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHBA50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 81 0 0 1 0 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_conusf000 b/parm/wmo/grib2_awpgfs_20km_conusf000
index 7f01e5c1e5..4eab5f3dbf 100644
--- a/parm/wmo/grib2_awpgfs_20km_conusf000
+++ b/parm/wmo/grib2_awpgfs_20km_conusf000
@@ -244,4 +244,3 @@
 &GRIBIDS DESC=' R H      2 m above ground ',WMOHEAD='YRNA98 KWBC',PDTN= 0 ,PDT=  1 1 2 0 81 0 0 1 0 103 0 2 255 0 0 /
 &GRIBIDS DESC=' U GRD    10 m above ground ',WMOHEAD='YUNA98 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 81 0 0 1 0 103 0 10 255 0 0 /
 &GRIBIDS DESC=' V GRD    10 m above ground ',WMOHEAD='YVNA98 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 81 0 0 1 0 103 0 10 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHNA50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 81 0 0 1 0 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_pacf000 b/parm/wmo/grib2_awpgfs_20km_pacf000
index c7fa00a405..f7d8962a07 100644
--- a/parm/wmo/grib2_awpgfs_20km_pacf000
+++ b/parm/wmo/grib2_awpgfs_20km_pacf000
@@ -244,4 +244,3 @@
 &GRIBIDS DESC=' R H      2 m above ground ',WMOHEAD='YREA98 KWBC',PDTN= 0 ,PDT=  1 1 2 0 81 0 0 1 0 103 0 2 255 0 0 /
 &GRIBIDS DESC=' U GRD    10 m above ground ',WMOHEAD='YUEA98 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 81 0 0 1 0 103 0 10 255 0 0 /
 &GRIBIDS DESC=' V GRD    10 m above ground ',WMOHEAD='YVEA98 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 81 0 0 1 0 103 0 10 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHEA50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 81 0 0 1 0 100 0 50000 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_pricof000 b/parm/wmo/grib2_awpgfs_20km_pricof000
index 9176d315d0..30a4ab9c97 100644
--- a/parm/wmo/grib2_awpgfs_20km_pricof000
+++ b/parm/wmo/grib2_awpgfs_20km_pricof000
@@ -244,4 +244,3 @@
 &GRIBIDS DESC=' R H      2 m above ground ',WMOHEAD='YRFA98 KWBC',PDTN= 0 ,PDT=  1 1 2 0 81 0 0 1 0 103 0 2 255 0 0 /
 &GRIBIDS DESC=' U GRD    10 m above ground ',WMOHEAD='YUFA98 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 81 0 0 1 0 103 0 10 255 0 0 /
 &GRIBIDS DESC=' V GRD    10 m above ground ',WMOHEAD='YVFA98 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 81 0 0 1 0 103 0 10 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHFA50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 81 0 0 1 0 100 0 50000 255 0 0 /
diff --git a/scripts/exgfs_atmos_awips_20km_1p0deg.sh b/scripts/exgfs_atmos_awips_20km_1p0deg.sh
index 4959bbd8e8..ba0c7f64b6 100755
--- a/scripts/exgfs_atmos_awips_20km_1p0deg.sh
+++ b/scripts/exgfs_atmos_awips_20km_1p0deg.sh
@@ -174,11 +174,6 @@ for GRID in conus ak prico pac 003; do
       export FORT51="grib2.awpgfs${fcsthrs}.${GRID}"
 
       cp "${PARMgfs}/wmo/grib2_awpgfs${fcsthrs}.${GRID}" "parm_list"
-      if [[ ${DO_WAVE} != "YES" ]]; then
-         # Remove wave field it not running wave model
-         grep -vw "5WAVH" "parm_list" > "parm_list_temp"
-         mv "parm_list_temp" "parm_list"
-      fi
 
       ${TOCGRIB2} < "parm_list" >> "${pgmout}" 2> errfile
       export err=$?; err_chk
@@ -208,11 +203,6 @@ for GRID in conus ak prico pac 003; do
       export FORT51="grib2.awpgfs_20km_${GRID}_f${fcsthrs}"
 
       cp "${PARMgfs}/wmo/grib2_awpgfs_20km_${GRID}f${fcsthrs}" "parm_list"
-      if [[ ${DO_WAVE} != "YES" ]]; then
-         # Remove wave field it not running wave model
-         grep -vw "5WAVH" "parm_list" > "parm_list_temp"
-         mv "parm_list_temp" "parm_list"
-      fi
 
       ${TOCGRIB2} < "parm_list" >> "${pgmout}" 2> errfile
       export err=$?; err_chk || exit "${err}"
diff --git a/scripts/exgfs_wave_init.sh b/scripts/exgfs_wave_init.sh
index 17e6cec042..dc174f258e 100755
--- a/scripts/exgfs_wave_init.sh
+++ b/scripts/exgfs_wave_init.sh
@@ -79,7 +79,7 @@ source "${USHgfs}/preamble.sh"
   chmod 744 cmdfile
 
 # Eliminate duplicate grids
-  array=($WAVECUR_FID $WAVEICE_FID $WAVEWND_FID $waveuoutpGRD $waveGRD $waveesmfGRD $wavepostGRD $waveinterpGRD)
+  array=($WAVECUR_FID $WAVEICE_FID $WAVEWND_FID $waveuoutpGRD $waveGRD $wavepostGRD $waveinterpGRD)
   grdALL=$(printf "%s\n" "${array[@]}" | sort -u | tr '\n' ' ')
 
   for grdID in ${grdALL}; do
diff --git a/scripts/exgfs_wave_post_gridded_sbs.sh b/scripts/exgfs_wave_post_gridded_sbs.sh
index a241a00d88..423d6af694 100755
--- a/scripts/exgfs_wave_post_gridded_sbs.sh
+++ b/scripts/exgfs_wave_post_gridded_sbs.sh
@@ -241,15 +241,13 @@ source "${USHgfs}/preamble.sh"
 
   if [ $fhr = $fhrg ]
   then
-    for wavGRD in ${waveGRD}; do
-      gfile="${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}"
-        if [[ ! -s "${gfile}" ]]; then
-          echo " FATAL ERROR : NO RAW FIELD OUTPUT FILE ${gfile}"
-          err=3; export err; "${errchk}"
-          exit "${err}"
-        fi
-      ${NLN} "${gfile}" "./out_grd.${wavGRD}"
-    done
+    gfile="${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${waveGRD}.${YMD}.${HMS}"
+      if [[ ! -s "${gfile}" ]]; then
+        echo " FATAL ERROR : NO RAW FIELD OUTPUT FILE ${gfile}"
+        err=3; export err; "${errchk}"
+        exit "${err}"
+      fi
+    ${NLN} "${gfile}" "./out_grd.${waveGRD}"
 
     if [ "$DOGRI_WAV" = 'YES' ]
     then
diff --git a/scripts/exglobal_archive.py b/scripts/exglobal_archive.py
index 5ae57ca7e3..ae613fb39c 100755
--- a/scripts/exglobal_archive.py
+++ b/scripts/exglobal_archive.py
@@ -17,6 +17,13 @@ def main():
     # Instantiate the Archive object
     archive = Archive(config)
 
+    # update these keys to be 3 digits if they are part of archive.task_config.keys
+    for key in ['OCNRES', 'ICERES']:
+        try:
+            archive.task_config[key] = f"{archive.task_config[key]:03d}"
+        except KeyError as ee:
+            logger.info(f"key ({key}) not found in archive.task_config!")
+
     # Pull out all the configuration keys needed to run the rest of archive steps
     keys = ['ATARDIR', 'current_cycle', 'FHMIN', 'FHMAX', 'FHOUT', 'RUN', 'PDY',
             'DO_VERFRAD', 'DO_VMINMON', 'DO_VERFOZN', 'DO_ICE', 'DO_PREP_OBS_AERO',
@@ -37,16 +44,15 @@ def main():
 
     archive_dict = AttrDict()
     for key in keys:
-        archive_dict[key] = archive.task_config.get(key)
-        if archive_dict[key] is None:
-            print(f"Warning: key ({key}) not found in task_config!")
+        try:
+            archive_dict[key] = archive.task_config[key]
+        except KeyError as ee:
+            logger.warning(f"WARNING: key ({key}) not found in archive.task_config!")
 
     # Also import all COMIN* and COMOUT* directory and template variables
     for key in archive.task_config.keys():
-        if key.startswith("COM_") or key.startswith("COMIN_") or key.startswith("COMOUT_"):
+        if key.startswith(("COM_", "COMIN_", "COMOUT_")):
             archive_dict[key] = archive.task_config.get(key)
-            if archive_dict[key] is None:
-                print(f"Warning: key ({key}) not found in task_config!")
 
     with chdir(config.ROTDIR):
 
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index f4618b948c..13d7c9c78b 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -104,8 +104,8 @@ _gefs_exec="gefs_model.x"
 _sfs_exec="sfs_model.x"
 build_opts=(
     ["ufs_gfs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -e ${_gfs_exec}"
-    ["ufs_gefs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -e ${_gefs_exec}"
-    ["ufs_sfs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -e ${_sfs_exec}"
+    ["ufs_gefs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -w -e ${_gefs_exec}"
+    ["ufs_sfs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -y -e ${_sfs_exec}"
     ["upp"]="${_build_debug}"
     ["ww3_gfs"]="${_verbose_opt} ${_build_debug}"
     ["ww3_gefs"]="-w ${_verbose_opt} ${_build_debug}"
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index 8c854d8685..64cb14a3ec 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -379,14 +379,7 @@ WW3_postdet() {
 
   # Link output files
   local wavprfx="${RUN}wave${WAV_MEMBER:-}"
-  if [[ "${waveMULTIGRID}" == ".true." ]]; then
-    ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.log.mww3.${PDY}${cyc}" "log.mww3"
-    for ww3_grid in ${waveGRD}; do
-      ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.log.${ww3_grid}.${PDY}${cyc}" "log.${ww3_grid}"
-    done
-  else
-    ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.log.${waveGRD}.${PDY}${cyc}" "log.ww3"
-  fi
+  ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.log.${waveGRD}.${PDY}${cyc}" "log.ww3"
 
   # Loop for gridded output (uses FHINC)
   local fhr vdate FHINC ww3_grid
@@ -394,13 +387,8 @@ WW3_postdet() {
   fhinc=${FHOUT_WAV}
   while (( fhr <= FHMAX_WAV )); do
     vdate=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${fhr} hours" +%Y%m%d.%H0000)
-    if [[ "${waveMULTIGRID}" == ".true." ]]; then
-      for ww3_grid in ${waveGRD} ; do
-        ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.out_grd.${ww3_grid}.${vdate}" "${DATA}/${vdate}.out_grd.${ww3_grid}"
-      done
-    else
-      ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.out_grd.${waveGRD}.${vdate}" "${DATA}/${vdate}.out_grd.ww3"
-    fi
+    ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.out_grd.${waveGRD}.${vdate}" "${DATA}/${vdate}.out_grd.ww3"
+
     if (( FHMAX_HF_WAV > 0 && FHOUT_HF_WAV > 0 && fhr < FHMAX_HF_WAV )); then
       fhinc=${FHOUT_HF_WAV}
     fi
@@ -412,11 +400,8 @@ WW3_postdet() {
   fhinc=${FHINCP_WAV}
   while (( fhr <= FHMAX_WAV )); do
     vdate=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${fhr} hours" +%Y%m%d.%H0000)
-    if [[ "${waveMULTIGRID}" == ".true." ]]; then
-      ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.out_pnt.${waveuoutpGRD}.${vdate}" "${DATA}/${vdate}.out_pnt.${waveuoutpGRD}"
-    else
-      ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.out_pnt.${waveuoutpGRD}.${vdate}" "${DATA}/${vdate}.out_pnt.ww3"
-    fi
+    ${NLN} "${COMOUT_WAVE_HISTORY}/${wavprfx}.out_pnt.${waveuoutpGRD}.${vdate}" "${DATA}/${vdate}.out_pnt.ww3"
+
     fhr=$((fhr + fhinc))
   done
 }
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
index e2862c24ad..2b730fa7d6 100755
--- a/ush/forecast_predet.sh
+++ b/ush/forecast_predet.sh
@@ -591,22 +591,9 @@ WW3_predet(){
   # Files from wave prep and wave init jobs
   # Copy mod_def files for wave grids
   local ww3_grid
-  if [[ "${waveMULTIGRID}" == ".true." ]]; then
-    local array=("${WAVECUR_FID}" "${WAVEICE_FID}" "${WAVEWND_FID}" "${waveuoutpGRD}" "${waveGRD}" "${waveesmfGRD}")
-    echo "Wave Grids: ${array[*]}"
-    local grdALL
-    # shellcheck disable=SC2312
-    grdALL=$(printf "%s\n" "${array[@]}" | sort -u | tr '\n' ' ')
-
-    for ww3_grid in ${grdALL}; do
-      ${NCP} "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${ww3_grid}" "${DATA}/mod_def.${ww3_grid}" \
-      || ( echo "FATAL ERROR: Failed to copy '${RUN}wave.mod_def.${ww3_grid}' from '${COMIN_WAVE_PREP}'"; exit 1 )
-    done
-  else
-    #if shel, only 1 waveGRD which is linked to mod_def.ww3
-    ${NCP} "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${waveGRD}" "${DATA}/mod_def.ww3" \
-    || ( echo "FATAL ERROR: Failed to copy '${RUN}wave.mod_def.${waveGRD}' from '${COMIN_WAVE_PREP}'"; exit 1 )
-  fi
+  #if shel, only 1 waveGRD which is linked to mod_def.ww3
+  ${NCP} "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${waveGRD}" "${DATA}/mod_def.ww3" \
+  || ( echo "FATAL ERROR: Failed to copy '${RUN}wave.mod_def.${waveGRD}' from '${COMIN_WAVE_PREP}'"; exit 1 )
 
   if [[ "${WW3ICEINP}" == "YES" ]]; then
     local wavicefile="${COMIN_WAVE_PREP}/${RUN}wave.${WAVEICE_FID}.t${current_cycle:8:2}z.ice"
@@ -638,20 +625,6 @@ WW3_predet(){
   fi
 
   WAV_MOD_TAG="${RUN}wave${waveMEMB}"
-  if [[ "${USE_WAV_RMP:-YES}" == "YES" ]]; then
-    local file file_array file_count
-    # shellcheck disable=SC2312
-    mapfile -t file_array < <(find "${FIXgfs}/wave" -name "rmp_src_to_dst_conserv_*" | sort)
-    file_count=${#file_array[@]}
-    if (( file_count > 0 )); then
-      for file in "${file_array[@]}" ; do
-        ${NCP} "${file}" "${DATA}/"
-      done
-    else
-      echo 'FATAL ERROR : No rmp precomputed nc files found for wave model, ABORT!'
-      exit 4
-    fi
-  fi
 }
 
 # shellcheck disable=SC2034
diff --git a/ush/parsing_namelists_WW3.sh b/ush/parsing_namelists_WW3.sh
index c57a90e50a..5ee4944c18 100755
--- a/ush/parsing_namelists_WW3.sh
+++ b/ush/parsing_namelists_WW3.sh
@@ -75,26 +75,14 @@ WW3_namelists(){
 
 
 # --------------------------------------------------------------------------- #
-# Create ww3_multi/shel.inp
+# Create ww3_shel.inp
 
-  if [ $waveMULTIGRID = ".true." ]; then
-    # ww3_multi template
-    if [ -f ${PARMgfs}/wave/ww3_multi.inp.tmpl ]; then
-      cp ${PARMgfs}/wave/ww3_multi.inp.tmpl ww3_multi.inp.tmpl
-    fi
-    if [ ! -f ww3_multi.inp.tmpl ]; then
-      echo "ABNORMAL EXIT: NO TEMPLATE FOR WW3 MULTI INPUT FILE" 
-      exit 11 
-    fi
-  else 
-    # ww3_multi template
-    if [ -f ${PARMgfs}/wave/ww3_shel.inp.tmpl ]; then
-      cp ${PARMgfs}/wave/ww3_shel.inp.tmpl ww3_shel.inp.tmpl
-    fi
-    if [ ! -f ww3_shel.inp.tmpl ]; then
-      echo "ABNORMAL EXIT: NO TEMPLATE FOR WW3 SHEL INPUT FILE" 
-      exit 12
-    fi
+  if [ -f "${PARMgfs}/wave/ww3_shel.inp.tmpl" ]; then
+    cp "${PARMgfs}/wave/ww3_shel.inp.tmpl" "ww3_shel.inp.tmpl"
+  fi
+  if [ ! -f ww3_shel.inp.tmpl ]; then
+    echo "ABNORMAL EXIT: NO TEMPLATE FOR WW3 SHEL INPUT FILE" 
+    exit 12
   fi
 
 # Buoy location file
@@ -114,213 +102,60 @@ WW3_namelists(){
     exit 12 
   fi
 
-
-
-if [ $waveMULTIGRID = ".true." ]; then
-#multi 
-
 # Initialize inp file parameters
-  NFGRIDS=0
-  NMGRIDS=0
-  CPLILINE='$'
-  ICELINE='$'
-  ICEFLAG='no'
-  CURRLINE='$'
-  CURRFLAG='no'
-  WINDLINE='$'
-  WINDFLAG='no'
-  UNIPOINTS='$'
-
-# Check for required inputs and coupling options
-  if [ $waveuoutpGRD ]
-  then
-    UNIPOINTS="'$waveuoutpGRD'"
-  fi
-
-# Check if waveesmfGRD is set
-  if [ ${waveesmfGRD} ]
-  then
-    NFGRIDS=$(expr $NFGRIDS + 1)
-  fi
-
-  case ${WW3ATMINP} in
-    'YES' )
-      NFGRIDS=$(expr $NFGRIDS + 1)
-      WINDLINE="  '$WAVEWND_FID'  F F T F F F F F F"
-      WINDFLAG="$WAVEWND_FID"
-    ;;
-    'CPL' )
-      WNDIFLAG='T'
-      if [ ${waveesmfGRD} ]
-      then
-        WINDFLAG="CPL:${waveesmfGRD}"
-        CPLILINE="  '${waveesmfGRD}' F F T F F F F F F"
-      else
-        WINDFLAG="CPL:native"
-      fi
-    ;;
-  esac
-
-  case ${WW3ICEINP} in
-    'YES' )
-      NFGRIDS=$(expr $NFGRIDS + 1)
-      ICEIFLAG='T'
-      ICELINE="  '$WAVEICE_FID'  F F F T F F F F F"
-      ICEFLAG="$WAVEICE_FID"
-    ;;
-    'CPL' )
-      ICEIFLAG='T'
-      if [ ${waveesmfGRD} ]
-      then
-        ICEFLAG="CPL:${waveesmfGRD}"
-        CPLILINE="  '${waveesmfGRD}' F F ${WNDIFLAG} T F F F F F"
-      else
-        ICEFLAG="CPL:native"
-      fi
-    ;;
-  esac
-
-  case ${WW3CURINP} in
-    'YES' )
-      if [ "$WAVECUR_FID" != "$WAVEICE_FID" ]; then
-        NFGRIDS=$(expr $NFGRIDS + 1)
-        CURRLINE="  '$WAVECUR_FID'  F T F F F F F F F"
-        CURRFLAG="$WAVECUR_FID"
-      else # cur fields share the same grid as ice grid
-        ICELINE="  '$WAVEICE_FID'  F T F ${ICEIFLAG} F F F F F"
-        CURRFLAG="$WAVEICE_FID"
-      fi
-    ;;
-    'CPL' )
-      CURIFLAG='T'
-      if [ ${waveesmfGRD} ]
-      then
-        CURRFLAG="CPL:${waveesmfGRD}"
-        CPLILINE="  '${waveesmfGRD}' F T ${WNDIFLAG} ${ICEFLAG} F F F F F"
-      else
-        CURRFLAG="CPL:native"
-      fi
-    ;;
-  esac
-
-  unset agrid
-  agrid=
-  gline=
-  GRDN=0
-#  grdGRP=1 # Single group for now
-  for grid in ${waveGRD}
-  do
-    GRDN=$(expr ${GRDN} + 1)
-    agrid=( ${agrid[*]} ${grid} )
-    NMGRIDS=$(expr $NMGRIDS + 1)
-    gridN=$(echo $waveGRDN | awk -v i=$GRDN '{print $i}')
-    gridG=$(echo $waveGRDG | awk -v i=$GRDN '{print $i}')
-    gline="${gline}'${grid}'  'no' 'CURRFLAG' 'WINDFLAG' 'ICEFLAG'  'no' 'no' 'no' 'no' 'no'  ${gridN} ${gridG}  0.00 1.00  F\n"
-  done
-  gline="${gline}\$"
-  echo $gline
-
-  sed -e "s/NFGRIDS/$NFGRIDS/g" \
-      -e "s/NMGRIDS/${NMGRIDS}/g" \
-      -e "s/FUNIPNT/${FUNIPNT}/g" \
-      -e "s/IOSRV/${IOSRV}/g" \
-      -e "s/FPNTPROC/${FPNTPROC}/g" \
-      -e "s/FGRDPROC/${FGRDPROC}/g" \
-      -e "s/OUTPARS/${OUTPARS_WAV}/g" \
-      -e "s/CPLILINE/${CPLILINE}/g" \
-      -e "s/UNIPOINTS/${UNIPOINTS}/g" \
-      -e "s/GRIDLINE/${gline}/g" \
-      -e "s/ICELINE/$ICELINE/g" \
-      -e "s/CURRLINE/$CURRLINE/g" \
-      -e "s/WINDLINE/$WINDLINE/g" \
-      -e "s/ICEFLAG/$ICEFLAG/g" \
-      -e "s/CURRFLAG/$CURRFLAG/g" \
-      -e "s/WINDFLAG/$WINDFLAG/g" \
-      -e "s/RUN_BEG/$time_beg/g" \
-      -e "s/RUN_END/$time_end/g" \
-      -e "s/OUT_BEG/$time_beg_out/g" \
-      -e "s/OUT_END/$time_end/g" \
-      -e "s/DTFLD/ $DTFLD_WAV/g" \
-      -e "s/FLAGMASKCOMP/ $FLAGMASKCOMP/g" \
-      -e "s/FLAGMASKOUT/ $FLAGMASKOUT/g" \
-      -e "s/GOFILETYPE/ $GOFILETYPE/g" \
-      -e "s/POFILETYPE/ $POFILETYPE/g" \
-      -e "s/DTPNT/ $DTPNT_WAV/g" \
-      -e "/BUOY_FILE/r buoy.loc" \
-      -e "s/BUOY_FILE/DUMMY/g" \
-      -e "s/RST_BEG/$time_rst_ini/g" \
-      -e "s/RSTTYPE/$RSTTYPE_WAV/g" \
-      -e "s/RST_2_BEG/$time_rst2_ini/g" \
-      -e "s/DTRST/$DT_1_RST_WAV/g" \
-      -e "s/DT_2_RST/$DT_2_RST_WAV/g" \
-      -e "s/RST_END/$time_rst1_end/g" \
-      -e "s/RST_2_END/$time_rst2_end/g" \
-                                     ww3_multi.inp.tmpl | \
-  sed -n "/DUMMY/!p"               > ww3_multi.inp
-
-  rm -f ww3_multi.inp.tmpl buoy.loc
-
-  cat ww3_multi.inp
-
-else 
-  #ww3_shel 
-
-# Initialize inp file parameters
-  ICELINE='F F'
-  CURRLINE='F F'
-  WINDLINE='F F'
-
-  case ${WW3ATMINP} in
-    'YES' )
-      WINDLINE="T F";;
-    'CPL' )
-      WINDLINE="C F";;
-  esac
-
-  case ${WW3ICEINP} in
-    'YES' )
-      ICELINE="T F";;
-    'CPL' )
-      ICELINE="C F";;
-  esac
-
-  case ${WW3CURINP} in
-    'YES' )
-      CURRLINE="T F";;
-    'CPL' )
-      CURRLINE="C F";;
-  esac
-
-  sed -e "s/IOSRV/${IOSRV}/g" \
-      -e "s/OUTPARS/${OUTPARS_WAV}/g" \
-      -e "s/ICELINE/$ICELINE/g" \
-      -e "s/CURRLINE/$CURRLINE/g" \
-      -e "s/WINDLINE/$WINDLINE/g" \
-      -e "s/RUN_BEG/$time_beg/g" \
-      -e "s/RUN_END/$time_end/g" \
-      -e "s/OUT_BEG/$time_beg_out/g" \
-      -e "s/OUT_END/$time_end/g" \
-      -e "s/DTFLD/ $DTFLD_WAV/g" \
-      -e "s/GOFILETYPE/ $GOFILETYPE/g" \
-      -e "s/POFILETYPE/ $POFILETYPE/g" \
-      -e "s/DTPNT/ $DTPNT_WAV/g" \
-      -e "s/DTPNT/ $DTPNT_WAV/g" \
-      -e "/BUOY_FILE/r buoy.loc" \
-      -e "s/BUOY_FILE/DUMMY/g" \
-      -e "s/RST_BEG/$time_rst_ini/g" \
-      -e "s/RSTTYPE/$RSTTYPE_WAV/g" \
-      -e "s/RST_2_BEG/$time_rst2_ini/g" \
-      -e "s/DTRST/$DT_1_RST_WAV/g" \
-      -e "s/DT_2_RST/$DT_2_RST_WAV/g" \
-      -e "s/RST_END/$time_rst1_end/g" \
-      -e "s/RST_2_END/$time_rst2_end/g" \
-                                     ww3_shel.inp.tmpl | \
-  sed -n "/DUMMY/!p"               > ww3_shel.inp
-
-  rm -f ww3_shel.inp.tmpl buoy.loc
-
-  cat ww3_shel.inp
-
-fi   
+ICELINE='F F'
+CURRLINE='F F'
+WINDLINE='F F'
+
+case ${WW3ATMINP} in
+  'YES' )
+    WINDLINE="T F";;
+  'CPL' )
+    WINDLINE="C F";;
+esac
+
+case ${WW3ICEINP} in
+  'YES' )
+    ICELINE="T F";;
+  'CPL' )
+    ICELINE="C F";;
+esac
+
+case ${WW3CURINP} in
+  'YES' )
+    CURRLINE="T F";;
+  'CPL' )
+    CURRLINE="C F";;
+esac
+
+sed -e "s/IOSRV/${IOSRV}/g" \
+    -e "s/OUTPARS/${OUTPARS_WAV}/g" \
+    -e "s/ICELINE/$ICELINE/g" \
+    -e "s/CURRLINE/$CURRLINE/g" \
+    -e "s/WINDLINE/$WINDLINE/g" \
+    -e "s/RUN_BEG/$time_beg/g" \
+    -e "s/RUN_END/$time_end/g" \
+    -e "s/OUT_BEG/$time_beg_out/g" \
+    -e "s/OUT_END/$time_end/g" \
+    -e "s/DTFLD/ $DTFLD_WAV/g" \
+    -e "s/GOFILETYPE/ $GOFILETYPE/g" \
+    -e "s/POFILETYPE/ $POFILETYPE/g" \
+    -e "s/DTPNT/ $DTPNT_WAV/g" \
+    -e "s/DTPNT/ $DTPNT_WAV/g" \
+    -e "/BUOY_FILE/r buoy.loc" \
+    -e "s/BUOY_FILE/DUMMY/g" \
+    -e "s/RST_BEG/$time_rst_ini/g" \
+    -e "s/RSTTYPE/$RSTTYPE_WAV/g" \
+    -e "s/RST_2_BEG/$time_rst2_ini/g" \
+    -e "s/DTRST/$DT_1_RST_WAV/g" \
+    -e "s/DT_2_RST/$DT_2_RST_WAV/g" \
+    -e "s/RST_END/$time_rst1_end/g" \
+    -e "s/RST_2_END/$time_rst2_end/g" \
+                                   ww3_shel.inp.tmpl | \
+sed -n "/DUMMY/!p"               > ww3_shel.inp
+
+rm -f ww3_shel.inp.tmpl buoy.loc
+
+cat ww3_shel.inp
 
 }
diff --git a/ush/parsing_ufs_configure.sh b/ush/parsing_ufs_configure.sh
index d8276476c4..7ee699ef0a 100755
--- a/ush/parsing_ufs_configure.sh
+++ b/ush/parsing_ufs_configure.sh
@@ -74,7 +74,6 @@ if [[ "${cplwav}" = ".true." ]]; then
   local wav_model="ww3"
   local wav_petlist_bounds="$(( ATMPETS+OCNPETS+ICEPETS )) $(( ATMPETS+OCNPETS+ICEPETS+WAVPETS-1 ))"
   local wav_omp_num_threads="${WAVTHREADS}"
-  local MULTIGRID="${waveMULTIGRID}"
   local WW3_user_sets_restname="false"
 
   local WW3_user_histname="false"
diff --git a/ush/wave_grid_interp_sbs.sh b/ush/wave_grid_interp_sbs.sh
index d56c5d0763..c046afb2e9 100755
--- a/ush/wave_grid_interp_sbs.sh
+++ b/ush/wave_grid_interp_sbs.sh
@@ -89,13 +89,12 @@ source "${USHgfs}/preamble.sh"
   fi
   ${NLN} "${DATA}/${grdID}_interp.inp.tmpl" "${grdID}_interp.inp.tmpl"
 
-  for ID in ${waveGRD}; do
-    ${NLN} "${DATA}/output_${ymdh}0000/out_grd.${ID}" "out_grd.${ID}"
-  done
+  ${NLN} "${DATA}/output_${ymdh}0000/out_grd.${waveGRD}" "out_grd.${waveGRD}"
 
   for ID in ${waveGRD} ${grdID}; do
     ${NLN} "${DATA}/mod_def.${ID}" "mod_def.${ID}"
   done
+  
 
 # --------------------------------------------------------------------------- #
 # 1.  Generate GRID file with all data
diff --git a/workflow/applications/gfs_cycled.py b/workflow/applications/gfs_cycled.py
index 5ecfddf276..4df03b9444 100644
--- a/workflow/applications/gfs_cycled.py
+++ b/workflow/applications/gfs_cycled.py
@@ -317,9 +317,9 @@ def get_task_names(self):
                     task_names[run].append('echgres') if 'gdas' in run else 0
                     task_names[run] += ['ediag'] if options['lobsdiag_forenkf'] else ['eomg']
                     task_names[run].append('esnowanl') if options['do_jedisnowda'] and 'gdas' in run else 0
-                    task_names[run].append('efcs') if 'gdas' in run else 0
-                    task_names[run].append('epos') if 'gdas' in run else 0
 
+                task_names[run].append('efcs') if 'gdas' in run else 0
+                task_names[run].append('epos') if 'gdas' in run else 0
                 task_names[run] += ['stage_ic', 'ecen', 'esfc', 'earc', 'cleanup']
 
         return task_names
diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
index 9b6f712380..d2a3e43719 100644
--- a/workflow/rocoto/gfs_tasks.py
+++ b/workflow/rocoto/gfs_tasks.py
@@ -2901,7 +2901,9 @@ def earc(self):
         else:
             dep_dict = {'type': 'task', 'name': f'{self.run}_esfc'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dependencies = rocoto.create_dependency(dep=deps)
+        dep_dict = {'type': 'task', 'name': f'{self.run}_echgres'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
         earcenvars = self.envars.copy()
         earcenvars.append(rocoto.create_envar(name='ENSGRP', value='#grp#'))