diff --git a/parm/wmo/grib2_awpgfs000.003 b/parm/wmo/grib2_awpgfs000.003
index 941ecf6e702..c3a317d2415 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 58fe211e0d7..bdfeaab370c 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 8c94bb70443..b367878e63a 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 845f26a7479..d89f2d2c73f 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 56eadc69031..e446f48766e 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 d2d37c03b06..59081135d73 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 7cbe4d0aaf5..4c18e96a12a 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 1be18748b39..ad2a74b711d 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 d5fce800542..131398d546a 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 92069b81103..1fa69592ea1 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 6c5d7edf6c1..a6bfd584750 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 d322d356656..546db96456a 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 3a7a4c48d8f..fbab37a6321 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 3556e82380c..3b94cf43463 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 3f3d88eab2f..20777aee0f0 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 dc606a19b21..8e1709bbf3b 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 02adbff2827..95e7388125a 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 7cecc5b0749..feab0338d4e 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 492e984f974..aa2a66f3a7a 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 181cb2e21e7..5f7606ddf4b 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 976ce08024c..a42df185ead 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 23742cdaf57..8f3f91c909d 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 0556a4bc192..dfa0a4e8f63 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 98a5813a3a8..8835cbfc72a 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 ba83e0134a4..1ac08b6b5ac 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 67fce65ebd9..b2162cced05 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 1ca86738ddf..c357fb88ccc 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 3f6efb6e220..3cafb1e7b8a 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 2f9e5913d6c..29c3278f356 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 eb54a49f35b..c6b9c977754 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 47670ca178a..dce38df27f0 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 10f3239a159..370b9ce6e8c 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 d3a9638d5e3..0a5bd27aca4 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 9b587fb043f..87036abba84 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 38551e73926..abf45424ea3 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 45d617ec9b8..74791a663f4 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 16de54e624d..dca67d2056d 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 e0d027c13df..d96242c1cbd 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 0309033c149..22e419660c9 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 36df325d448..6a6a4a89d96 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 b55f8d2194b..4fe553764ed 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 10205f0c3ae..d44d417e361 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 7f01e5c1e5f..4eab5f3dbfe 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 c7fa00a4055..f7d8962a075 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 9176d315d09..30a4ab9c978 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 4959bbd8e89..ba0c7f64b67 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}"