diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def
index eb319acb5..07bd12578 100644
--- a/definitions/grib1/localConcepts/ecmf/name.def
+++ b/definitions/grib1/localConcepts/ecmf/name.def
@@ -14984,11 +14984,6 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 45 ;
 	}
-#Magnitude of turbulent surface stress
-'Magnitude of turbulent surface stress' = {
-	 table2Version = 172 ;
-	 indicatorOfParameter = 48 ;
-	}
 #Mean large-scale precipitation fraction
 'Mean large-scale precipitation fraction' = {
 	 table2Version = 172 ;
diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def
index 6301ec4ff..3347f26b7 100644
--- a/definitions/grib1/localConcepts/ecmf/paramId.def
+++ b/definitions/grib1/localConcepts/ecmf/paramId.def
@@ -14984,11 +14984,6 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 45 ;
 	}
-#Magnitude of turbulent surface stress
-'172048' = {
-	 table2Version = 172 ;
-	 indicatorOfParameter = 48 ;
-	}
 #Mean large-scale precipitation fraction
 '172050' = {
 	 table2Version = 172 ;
diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def
index c7fde21ea..fb32662bd 100644
--- a/definitions/grib1/localConcepts/ecmf/shortName.def
+++ b/definitions/grib1/localConcepts/ecmf/shortName.def
@@ -14984,11 +14984,6 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 45 ;
 	}
-#Magnitude of turbulent surface stress
-'~' = {
-	 table2Version = 172 ;
-	 indicatorOfParameter = 48 ;
-	}
 #Mean large-scale precipitation fraction
 'mlspfr' = {
 	 table2Version = 172 ;
diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def
index ae33fd2ee..6ec4e8064 100644
--- a/definitions/grib1/localConcepts/ecmf/units.def
+++ b/definitions/grib1/localConcepts/ecmf/units.def
@@ -14984,11 +14984,6 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 45 ;
 	}
-#Magnitude of turbulent surface stress
-'N m**-2' = {
-	 table2Version = 172 ;
-	 indicatorOfParameter = 48 ;
-	}
 #Mean large-scale precipitation fraction
 '~' = {
 	 table2Version = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def
index 1e390741a..8d00d429a 100644
--- a/definitions/grib2/localConcepts/ecmf/name.def
+++ b/definitions/grib2/localConcepts/ecmf/name.def
@@ -266,18 +266,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 71 ;
 	}
-#Instantaneous surface solar radiation downwards
-'Instantaneous surface solar radiation downwards' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 72 ;
-	}
-#Instantaneous surface thermal radiation downwards
-'Instantaneous surface thermal radiation downwards' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 73 ;
-	}
 #Experimental product
 'Experimental product' = {
 	 discipline = 192 ;
@@ -18782,18 +18770,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Magnitude of turbulent surface stress
-'Magnitude of turbulent surface stress' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 48 ;
-	}
-#Mean large-scale precipitation fraction
-'Mean large-scale precipitation fraction' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 50 ;
-	}
 #Mean large-scale precipitation rate
 'Mean large-scale precipitation rate' = {
 	 localTablesVersion = 1 ;
@@ -18821,12 +18797,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Boundary layer dissipation
-'Boundary layer dissipation' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 145 ;
-	}
 #Mean short-wave heating rate
 'Mean short-wave heating rate' = {
 	 discipline = 192 ;
@@ -18848,30 +18818,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sunshine duration rate
-'Mean sunshine duration rate' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 189 ;
-	}
-#Longitudinal component of gravity wave stress
-'Longitudinal component of gravity wave stress' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 195 ;
-	}
-#Meridional component of gravity wave stress
-'Meridional component of gravity wave stress' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 196 ;
-	}
-#Gravity wave dissipation
-'Gravity wave dissipation' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 197 ;
-	}
 #Mean runoff rate
 'Mean runoff rate' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.legacy.def b/definitions/grib2/localConcepts/ecmf/name.legacy.def
index 7d8d36d0f..28b2586ef 100644
--- a/definitions/grib2/localConcepts/ecmf/name.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/name.legacy.def
@@ -1777,45 +1777,3 @@
  parameterCategory = 140 ;
  parameterNumber = 254 ;
 }
-#Magnitude of turbulent surface stress
-'Magnitude of turbulent surface stress' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 48 ;
-}
-#Mean large-scale precipitation fraction
-'Mean large-scale precipitation fraction' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 50 ;
-}
-#Boundary layer dissipation
-'Boundary layer dissipation' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 145 ;
-}
-#Mean sunshine duration rate
-'Mean sunshine duration rate' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 189 ;
-}
-#Longitudinal component of gravity wave stress
-'Longitudinal component of gravity wave stress' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 195 ;
-}
-#Meridional component of gravity wave stress
-'Meridional component of gravity wave stress' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 196 ;
-}
-#Gravity wave dissipation
-'Gravity wave dissipation' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 197 ;
-}
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def
index ab184ae4d..b4e5a0c5f 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.def
@@ -266,18 +266,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 71 ;
 	}
-#Instantaneous surface solar radiation downwards
-'72' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 72 ;
-	}
-#Instantaneous surface thermal radiation downwards
-'73' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 73 ;
-	}
 #Experimental product
 '80' = {
 	 discipline = 192 ;
@@ -18782,18 +18770,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Magnitude of turbulent surface stress
-'172048' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 48 ;
-	}
-#Mean large-scale precipitation fraction
-'172050' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 50 ;
-	}
 #Mean large-scale precipitation rate
 '172142' = {
 	 localTablesVersion = 1 ;
@@ -18821,12 +18797,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Boundary layer dissipation
-'172145' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 145 ;
-	}
 #Mean short-wave heating rate
 '172153' = {
 	 discipline = 192 ;
@@ -18848,30 +18818,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sunshine duration rate
-'172189' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 189 ;
-	}
-#Longitudinal component of gravity wave stress
-'172195' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 195 ;
-	}
-#Meridional component of gravity wave stress
-'172196' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 196 ;
-	}
-#Gravity wave dissipation
-'172197' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 197 ;
-	}
 #Mean runoff rate
 '172205' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
index 4d746c798..df813254f 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
@@ -1777,45 +1777,3 @@
  parameterCategory = 140 ;
  parameterNumber = 254 ;
 }
-#Magnitude of turbulent surface stress
-'172048' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 48 ;
-}
-#Mean large-scale precipitation fraction
-'172050' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 50 ;
-}
-#Boundary layer dissipation
-'172145' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 145 ;
-}
-#Mean sunshine duration rate
-'172189' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 189 ;
-}
-#Longitudinal component of gravity wave stress
-'172195' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 195 ;
-}
-#Meridional component of gravity wave stress
-'172196' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 196 ;
-}
-#Gravity wave dissipation
-'172197' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 197 ;
-}
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def
index e5fa627d0..2f124dd73 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.def
@@ -266,18 +266,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 71 ;
 	}
-#Instantaneous surface solar radiation downwards
-'issrd' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 72 ;
-	}
-#Instantaneous surface thermal radiation downwards
-'istrd' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 73 ;
-	}
 #Experimental product
 '~' = {
 	 discipline = 192 ;
@@ -18782,18 +18770,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Magnitude of turbulent surface stress
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 48 ;
-	}
-#Mean large-scale precipitation fraction
-'mlspfr' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 50 ;
-	}
 #Mean large-scale precipitation rate
 'mlsprt' = {
 	 localTablesVersion = 1 ;
@@ -18821,12 +18797,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Boundary layer dissipation
-'bldrate' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 145 ;
-	}
 #Mean short-wave heating rate
 'mswhr' = {
 	 discipline = 192 ;
@@ -18848,30 +18818,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sunshine duration rate
-'msdr' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 189 ;
-	}
-#Longitudinal component of gravity wave stress
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 195 ;
-	}
-#Meridional component of gravity wave stress
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 196 ;
-	}
-#Gravity wave dissipation
-'gwdrate' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 197 ;
-	}
 #Mean runoff rate
 'mrort' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
index c954c06c9..498f6a3c1 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
@@ -1777,45 +1777,3 @@
  parameterCategory = 140 ;
  parameterNumber = 254 ;
 }
-#Magnitude of turbulent surface stress
-'~' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 48 ;
-}
-#Mean large-scale precipitation fraction
-'mlspfr' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 50 ;
-}
-#Boundary layer dissipation
-'bldrate' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 145 ;
-}
-#Mean sunshine duration rate
-'msdr' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 189 ;
-}
-#Longitudinal component of gravity wave stress
-'~' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 195 ;
-}
-#Meridional component of gravity wave stress
-'~' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 196 ;
-}
-#Gravity wave dissipation
-'gwdrate' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 197 ;
-}
diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def
index 7931fee09..c8c65ba8a 100644
--- a/definitions/grib2/localConcepts/ecmf/units.def
+++ b/definitions/grib2/localConcepts/ecmf/units.def
@@ -266,18 +266,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 71 ;
 	}
-#Instantaneous surface solar radiation downwards
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 72 ;
-	}
-#Instantaneous surface thermal radiation downwards
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 73 ;
-	}
 #Experimental product
 '~' = {
 	 discipline = 192 ;
@@ -18782,18 +18770,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Magnitude of turbulent surface stress
-'N m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 48 ;
-	}
-#Mean large-scale precipitation fraction
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 50 ;
-	}
 #Mean large-scale precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
@@ -18821,12 +18797,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Boundary layer dissipation
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 145 ;
-	}
 #Mean short-wave heating rate
 'K s**-1' = {
 	 discipline = 192 ;
@@ -18848,30 +18818,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sunshine duration rate
-'s s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 189 ;
-	}
-#Longitudinal component of gravity wave stress
-'N m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 195 ;
-	}
-#Meridional component of gravity wave stress
-'N m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 196 ;
-	}
-#Gravity wave dissipation
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 197 ;
-	}
 #Mean runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.legacy.def b/definitions/grib2/localConcepts/ecmf/units.legacy.def
index 953b96cc0..d7675c4d6 100644
--- a/definitions/grib2/localConcepts/ecmf/units.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/units.legacy.def
@@ -1777,45 +1777,3 @@
  parameterCategory = 140 ;
  parameterNumber = 254 ;
 }
-#Magnitude of turbulent surface stress
-'N m**-2' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 48 ;
-}
-#Mean large-scale precipitation fraction
-'~' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 50 ;
-}
-#Boundary layer dissipation
-'W m**-2' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 145 ;
-}
-#Mean sunshine duration rate
-'s s**-1' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 189 ;
-}
-#Longitudinal component of gravity wave stress
-'N m**-2' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 195 ;
-}
-#Meridional component of gravity wave stress
-'N m**-2' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 196 ;
-}
-#Gravity wave dissipation
-'W m**-2' = {
- discipline = 192 ;
- parameterCategory = 172 ;
- parameterNumber = 197 ;
-}
diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
index 56d6adccc..ba2128aa3 100644
--- a/definitions/grib2/name.def
+++ b/definitions/grib2/name.def
@@ -6441,18 +6441,6 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 51 ;
 	}
-#Net long wave radiation flux (surface)
-'Net long wave radiation flux (surface)' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 0 ;
-	}
-#Net long wave radiation flux (top of atmosphere)
-'Net long wave radiation flux (top of atmosphere)' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 1 ;
-	}
 #Surface downward long-wave radiation flux
 'Surface downward long-wave radiation flux' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
index 6d5c38537..559dfa569 100644
--- a/definitions/grib2/paramId.def
+++ b/definitions/grib2/paramId.def
@@ -6441,18 +6441,6 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 51 ;
 	}
-#Net long wave radiation flux (surface)
-'260095' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 0 ;
-	}
-#Net long wave radiation flux (top of atmosphere)
-'260096' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 1 ;
-	}
 #Surface downward long-wave radiation flux
 '260097' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
index 78d215c1c..d3938a656 100644
--- a/definitions/grib2/shortName.def
+++ b/definitions/grib2/shortName.def
@@ -6441,18 +6441,6 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 51 ;
 	}
-#Net long wave radiation flux (surface)
-'nlwrs' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 0 ;
-	}
-#Net long wave radiation flux (top of atmosphere)
-'nlwrt' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 1 ;
-	}
 #Surface downward long-wave radiation flux
 'sdlwrf' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
index 22b733ff6..d71fda3c2 100644
--- a/definitions/grib2/units.def
+++ b/definitions/grib2/units.def
@@ -6441,18 +6441,6 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 51 ;
 	}
-#Net long wave radiation flux (surface)
-'W m**-2' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 0 ;
-	}
-#Net long wave radiation flux (top of atmosphere)
-'W m**-2' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 1 ;
-	}
 #Surface downward long-wave radiation flux
 'W m**-2' = {
 	 discipline = 0 ;