diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def
index 07bd12578..86e2052b0 100644
--- a/definitions/grib1/localConcepts/ecmf/name.def
+++ b/definitions/grib1/localConcepts/ecmf/name.def
@@ -2374,16 +2374,6 @@
 	 table2Version = 200 ;
 	 indicatorOfParameter = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'Minimum stomatal resistance, low vegetation' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'Minimum stomatal resistance, high vegetation' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 69 ;
-	}
 #Biome cover, low vegetation
 'Biome cover, low vegetation' = {
 	 table2Version = 200 ;
@@ -10544,21 +10534,6 @@
 	 table2Version = 235 ;
 	 indicatorOfParameter = 64 ;
 	}
-#Mean rain rate
-'Mean rain rate' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 65 ;
-	}
-#Mean convective rain rate
-'Mean convective rain rate' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 66 ;
-	}
-#Mean large-scale rain rate
-'Mean large-scale rain rate' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 67 ;
-	}
 #Mean surface downward short-wave radiation flux, clear sky
 'Mean surface downward short-wave radiation flux, clear sky' = {
 	 table2Version = 235 ;
@@ -10874,16 +10849,6 @@
 	 table2Version = 129 ;
 	 indicatorOfParameter = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'Minimum stomatal resistance, low vegetation' = {
-	 table2Version = 129 ;
-	 indicatorOfParameter = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'Minimum stomatal resistance, high vegetation' = {
-	 table2Version = 129 ;
-	 indicatorOfParameter = 69 ;
-	}
 #Biome cover, low vegetation
 'Biome cover, low vegetation' = {
 	 table2Version = 129 ;
@@ -13494,36 +13459,16 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 199 ;
 	}
-#Maximum temperature at 2 metres during averaging time
-'Maximum temperature at 2 metres during averaging time' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 201 ;
-	}
-#Minimum temperature at 2 metres during averaging time
-'Minimum temperature at 2 metres during averaging time' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 202 ;
-	}
 #Runoff
 'Runoff' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Standard deviation of geopotential
-'Standard deviation of geopotential' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 206 ;
-	}
 #Covariance of temperature and geopotential
 'Covariance of temperature and geopotential' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 207 ;
 	}
-#Standard deviation of temperature
-'Standard deviation of temperature' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 208 ;
-	}
 #Covariance of specific humidity and geopotential
 'Covariance of specific humidity and geopotential' = {
 	 table2Version = 160 ;
@@ -13534,11 +13479,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Standard deviation of specific humidity
-'Standard deviation of specific humidity' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 211 ;
-	}
 #Covariance of U component and geopotential
 'Covariance of U component and geopotential' = {
 	 table2Version = 160 ;
@@ -13554,11 +13494,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 214 ;
 	}
-#Standard deviation of U velocity
-'Standard deviation of U velocity' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 215 ;
-	}
 #Covariance of V component and geopotential
 'Covariance of V component and geopotential' = {
 	 table2Version = 160 ;
@@ -13579,11 +13514,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 219 ;
 	}
-#Standard deviation of V component
-'Standard deviation of V component' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 220 ;
-	}
 #Covariance of W component and geopotential
 'Covariance of W component and geopotential' = {
 	 table2Version = 160 ;
@@ -13609,11 +13539,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 225 ;
 	}
-#Standard deviation of vertical velocity
-'Standard deviation of vertical velocity' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 226 ;
-	}
 #Instantaneous surface heat flux
 'Instantaneous surface heat flux' = {
 	 table2Version = 160 ;
@@ -16039,11 +15964,6 @@
 	 table2Version = 201 ;
 	 indicatorOfParameter = 113 ;
 	}
-#deviation of pressure from reference value
-'deviation of pressure from reference value' = {
-	 table2Version = 201 ;
-	 indicatorOfParameter = 139 ;
-	}
 #coefficient of horizontal diffusion
 'coefficient of horizontal diffusion' = {
 	 table2Version = 201 ;
diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def
index 3347f26b7..0067a92f6 100644
--- a/definitions/grib1/localConcepts/ecmf/paramId.def
+++ b/definitions/grib1/localConcepts/ecmf/paramId.def
@@ -2374,16 +2374,6 @@
 	 table2Version = 200 ;
 	 indicatorOfParameter = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'200068' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'200069' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 69 ;
-	}
 #Biome cover, low vegetation
 '200070' = {
 	 table2Version = 200 ;
@@ -10544,21 +10534,6 @@
 	 table2Version = 235 ;
 	 indicatorOfParameter = 64 ;
 	}
-#Mean rain rate
-'235065' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 65 ;
-	}
-#Mean convective rain rate
-'235066' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 66 ;
-	}
-#Mean large-scale rain rate
-'235067' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 67 ;
-	}
 #Mean surface downward short-wave radiation flux, clear sky
 '235068' = {
 	 table2Version = 235 ;
@@ -10874,16 +10849,6 @@
 	 table2Version = 129 ;
 	 indicatorOfParameter = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'129068' = {
-	 table2Version = 129 ;
-	 indicatorOfParameter = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'129069' = {
-	 table2Version = 129 ;
-	 indicatorOfParameter = 69 ;
-	}
 #Biome cover, low vegetation
 '129070' = {
 	 table2Version = 129 ;
@@ -13494,36 +13459,16 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 199 ;
 	}
-#Maximum temperature at 2 metres during averaging time
-'160201' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 201 ;
-	}
-#Minimum temperature at 2 metres during averaging time
-'160202' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 202 ;
-	}
 #Runoff
 '160205' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Standard deviation of geopotential
-'160206' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 206 ;
-	}
 #Covariance of temperature and geopotential
 '160207' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 207 ;
 	}
-#Standard deviation of temperature
-'160208' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 208 ;
-	}
 #Covariance of specific humidity and geopotential
 '160209' = {
 	 table2Version = 160 ;
@@ -13534,11 +13479,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Standard deviation of specific humidity
-'160211' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 211 ;
-	}
 #Covariance of U component and geopotential
 '160212' = {
 	 table2Version = 160 ;
@@ -13554,11 +13494,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 214 ;
 	}
-#Standard deviation of U velocity
-'160215' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 215 ;
-	}
 #Covariance of V component and geopotential
 '160216' = {
 	 table2Version = 160 ;
@@ -13579,11 +13514,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 219 ;
 	}
-#Standard deviation of V component
-'160220' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 220 ;
-	}
 #Covariance of W component and geopotential
 '160221' = {
 	 table2Version = 160 ;
@@ -13609,11 +13539,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 225 ;
 	}
-#Standard deviation of vertical velocity
-'160226' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 226 ;
-	}
 #Instantaneous surface heat flux
 '160231' = {
 	 table2Version = 160 ;
@@ -16039,11 +15964,6 @@
 	 table2Version = 201 ;
 	 indicatorOfParameter = 113 ;
 	}
-#deviation of pressure from reference value
-'201139' = {
-	 table2Version = 201 ;
-	 indicatorOfParameter = 139 ;
-	}
 #coefficient of horizontal diffusion
 '201150' = {
 	 table2Version = 201 ;
diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def
index fb32662bd..977615eff 100644
--- a/definitions/grib1/localConcepts/ecmf/shortName.def
+++ b/definitions/grib1/localConcepts/ecmf/shortName.def
@@ -2374,16 +2374,6 @@
 	 table2Version = 200 ;
 	 indicatorOfParameter = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'~' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'~' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 69 ;
-	}
 #Biome cover, low vegetation
 '~' = {
 	 table2Version = 200 ;
@@ -10544,21 +10534,6 @@
 	 table2Version = 235 ;
 	 indicatorOfParameter = 64 ;
 	}
-#Mean rain rate
-'mrr' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 65 ;
-	}
-#Mean convective rain rate
-'mcrr' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 66 ;
-	}
-#Mean large-scale rain rate
-'mlsrr' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 67 ;
-	}
 #Mean surface downward short-wave radiation flux, clear sky
 'msdwswrfcs' = {
 	 table2Version = 235 ;
@@ -10874,16 +10849,6 @@
 	 table2Version = 129 ;
 	 indicatorOfParameter = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'~' = {
-	 table2Version = 129 ;
-	 indicatorOfParameter = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'~' = {
-	 table2Version = 129 ;
-	 indicatorOfParameter = 69 ;
-	}
 #Biome cover, low vegetation
 '~' = {
 	 table2Version = 129 ;
@@ -13494,36 +13459,16 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 199 ;
 	}
-#Maximum temperature at 2 metres during averaging time
-'mx2trea' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 201 ;
-	}
-#Minimum temperature at 2 metres during averaging time
-'mn2trea' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 202 ;
-	}
 #Runoff
 'rorea' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Standard deviation of geopotential
-'zzrea' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 206 ;
-	}
 #Covariance of temperature and geopotential
 'tzrea' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 207 ;
 	}
-#Standard deviation of temperature
-'ttrea' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 208 ;
-	}
 #Covariance of specific humidity and geopotential
 'qzrea' = {
 	 table2Version = 160 ;
@@ -13534,11 +13479,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Standard deviation of specific humidity
-'qqrea' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 211 ;
-	}
 #Covariance of U component and geopotential
 'uzrea' = {
 	 table2Version = 160 ;
@@ -13554,11 +13494,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 214 ;
 	}
-#Standard deviation of U velocity
-'uurea' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 215 ;
-	}
 #Covariance of V component and geopotential
 'vzrea' = {
 	 table2Version = 160 ;
@@ -13579,11 +13514,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 219 ;
 	}
-#Standard deviation of V component
-'vvrea' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 220 ;
-	}
 #Covariance of W component and geopotential
 'wzrea' = {
 	 table2Version = 160 ;
@@ -13609,11 +13539,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 225 ;
 	}
-#Standard deviation of vertical velocity
-'wwrea' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 226 ;
-	}
 #Instantaneous surface heat flux
 'ishfrea' = {
 	 table2Version = 160 ;
@@ -16039,11 +15964,6 @@
 	 table2Version = 201 ;
 	 indicatorOfParameter = 113 ;
 	}
-#deviation of pressure from reference value
-'pp' = {
-	 table2Version = 201 ;
-	 indicatorOfParameter = 139 ;
-	}
 #coefficient of horizontal diffusion
 '~' = {
 	 table2Version = 201 ;
diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def
index 6ec4e8064..6aa3f3cea 100644
--- a/definitions/grib1/localConcepts/ecmf/units.def
+++ b/definitions/grib1/localConcepts/ecmf/units.def
@@ -2374,16 +2374,6 @@
 	 table2Version = 200 ;
 	 indicatorOfParameter = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'s m**-1' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'s m**-1' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 69 ;
-	}
 #Biome cover, low vegetation
 '(0 - 1)' = {
 	 table2Version = 200 ;
@@ -10544,21 +10534,6 @@
 	 table2Version = 235 ;
 	 indicatorOfParameter = 64 ;
 	}
-#Mean rain rate
-'kg m**-2 s**-1' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 65 ;
-	}
-#Mean convective rain rate
-'kg m**-2 s**-1' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 66 ;
-	}
-#Mean large-scale rain rate
-'kg m**-2 s**-1' = {
-	 table2Version = 235 ;
-	 indicatorOfParameter = 67 ;
-	}
 #Mean surface downward short-wave radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
@@ -10874,16 +10849,6 @@
 	 table2Version = 129 ;
 	 indicatorOfParameter = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'s m**-1' = {
-	 table2Version = 129 ;
-	 indicatorOfParameter = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'s m**-1' = {
-	 table2Version = 129 ;
-	 indicatorOfParameter = 69 ;
-	}
 #Biome cover, low vegetation
 '(0 - 1)' = {
 	 table2Version = 129 ;
@@ -13494,36 +13459,16 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 199 ;
 	}
-#Maximum temperature at 2 metres during averaging time
-'K' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 201 ;
-	}
-#Minimum temperature at 2 metres during averaging time
-'K' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 202 ;
-	}
 #Runoff
 'kg m**-2 s**-1' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Standard deviation of geopotential
-'m**2 s**-2' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 206 ;
-	}
 #Covariance of temperature and geopotential
 'K m**2 s**-2' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 207 ;
 	}
-#Standard deviation of temperature
-'K' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 208 ;
-	}
 #Covariance of specific humidity and geopotential
 'm**2 s**-2' = {
 	 table2Version = 160 ;
@@ -13534,11 +13479,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Standard deviation of specific humidity
-'(0 - 1)' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 211 ;
-	}
 #Covariance of U component and geopotential
 'm**3 s**-3' = {
 	 table2Version = 160 ;
@@ -13554,11 +13494,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 214 ;
 	}
-#Standard deviation of U velocity
-'m s**-1' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 215 ;
-	}
 #Covariance of V component and geopotential
 'm**3 s**-3' = {
 	 table2Version = 160 ;
@@ -13579,11 +13514,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 219 ;
 	}
-#Standard deviation of V component
-'m s**-1' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 220 ;
-	}
 #Covariance of W component and geopotential
 'Pa m**2 s**-3' = {
 	 table2Version = 160 ;
@@ -13609,11 +13539,6 @@
 	 table2Version = 160 ;
 	 indicatorOfParameter = 225 ;
 	}
-#Standard deviation of vertical velocity
-'Pa s**-1' = {
-	 table2Version = 160 ;
-	 indicatorOfParameter = 226 ;
-	}
 #Instantaneous surface heat flux
 'J m**-2' = {
 	 table2Version = 160 ;
@@ -14975,12 +14900,12 @@
 	 indicatorOfParameter = 255 ;
 	}
 #Snow evaporation
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 44 ;
 	}
 #Snowmelt
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 45 ;
 	}
@@ -15145,12 +15070,12 @@
 	 indicatorOfParameter = 255 ;
 	}
 #Snow evaporation anomaly
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 44 ;
 	}
 #Snowmelt anomaly
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 45 ;
 	}
@@ -15250,7 +15175,7 @@
 	 indicatorOfParameter = 181 ;
 	}
 #Evaporation anomalous rate of accumulation
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 182 ;
 	}
@@ -16039,11 +15964,6 @@
 	 table2Version = 201 ;
 	 indicatorOfParameter = 113 ;
 	}
-#deviation of pressure from reference value
-'Pa' = {
-	 table2Version = 201 ;
-	 indicatorOfParameter = 139 ;
-	}
 #coefficient of horizontal diffusion
 'm**2 s**-1' = {
 	 table2Version = 201 ;
diff --git a/definitions/grib1/localConcepts/rjtd/name.def b/definitions/grib1/localConcepts/rjtd/name.def
index 3b4fa8db8..273bcfc53 100644
--- a/definitions/grib1/localConcepts/rjtd/name.def
+++ b/definitions/grib1/localConcepts/rjtd/name.def
@@ -213,11 +213,6 @@
 	 table2Version = 200 ;
 	 indicatorOfParameter = 78 ;
 	}
-#Maximum wind speed
-'Maximum wind speed' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 219 ;
-	}
 #Surface downward short-wave radiation flux
 'Surface downward short-wave radiation flux' = {
 	 table2Version = 200 ;
diff --git a/definitions/grib1/localConcepts/rjtd/paramId.def b/definitions/grib1/localConcepts/rjtd/paramId.def
index 392359de9..989e5d15a 100644
--- a/definitions/grib1/localConcepts/rjtd/paramId.def
+++ b/definitions/grib1/localConcepts/rjtd/paramId.def
@@ -213,11 +213,6 @@
 	 table2Version = 200 ;
 	 indicatorOfParameter = 78 ;
 	}
-#Maximum wind speed
-'260064' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 219 ;
-	}
 #Surface downward short-wave radiation flux
 '260087' = {
 	 table2Version = 200 ;
diff --git a/definitions/grib1/localConcepts/rjtd/shortName.def b/definitions/grib1/localConcepts/rjtd/shortName.def
index 766592e9b..6bb3018f9 100644
--- a/definitions/grib1/localConcepts/rjtd/shortName.def
+++ b/definitions/grib1/localConcepts/rjtd/shortName.def
@@ -213,11 +213,6 @@
 	 table2Version = 200 ;
 	 indicatorOfParameter = 78 ;
 	}
-#Maximum wind speed
-'maxgust' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 219 ;
-	}
 #Surface downward short-wave radiation flux
 'sdswrf' = {
 	 table2Version = 200 ;
diff --git a/definitions/grib1/localConcepts/rjtd/units.def b/definitions/grib1/localConcepts/rjtd/units.def
index 81ef6cf02..b33c58ee8 100644
--- a/definitions/grib1/localConcepts/rjtd/units.def
+++ b/definitions/grib1/localConcepts/rjtd/units.def
@@ -213,11 +213,6 @@
 	 table2Version = 200 ;
 	 indicatorOfParameter = 78 ;
 	}
-#Maximum wind speed
-'m s**-1' = {
-	 table2Version = 200 ;
-	 indicatorOfParameter = 219 ;
-	}
 #Surface downward short-wave radiation flux
 'W m**-2' = {
 	 table2Version = 200 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def
index 8d00d429a..d3796d9dc 100644
--- a/definitions/grib2/localConcepts/ecmf/name.def
+++ b/definitions/grib2/localConcepts/ecmf/name.def
@@ -242,18 +242,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 65 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'Minimum stomatal resistance, low vegetation' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'Minimum stomatal resistance, high vegetation' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 'Biome cover, low vegetation' = {
 	 discipline = 192 ;
@@ -1277,18 +1265,6 @@
 	 parameterCategory = 200 ;
 	 parameterNumber = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'Minimum stomatal resistance, low vegetation' = {
-	 discipline = 192 ;
-	 parameterCategory = 200 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'Minimum stomatal resistance, high vegetation' = {
-	 discipline = 192 ;
-	 parameterCategory = 200 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 'Biome cover, low vegetation' = {
 	 discipline = 192 ;
@@ -14524,18 +14500,6 @@
 	 parameterCategory = 129 ;
 	 parameterNumber = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'Minimum stomatal resistance, low vegetation' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'Minimum stomatal resistance, high vegetation' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 'Biome cover, low vegetation' = {
 	 discipline = 192 ;
@@ -17024,30 +16988,6 @@
 	 parameterCategory = 151 ;
 	 parameterNumber = 170 ;
 	}
-#U velocity maximum
-'U velocity maximum' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 171 ;
-	}
-#Depth of the velocity maximum
-'Depth of the velocity maximum' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 172 ;
-	}
-#Salinity maximum
-'Salinity maximum' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 173 ;
-	}
-#Depth of salinity maximum
-'Depth of salinity maximum' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 174 ;
-	}
 #Layer Thickness at scalar points
 'Layer Thickness at scalar points' = {
 	 discipline = 192 ;
@@ -17330,42 +17270,18 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 199 ;
 	}
-#Maximum temperature at 2 metres during averaging time
-'Maximum temperature at 2 metres during averaging time' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 201 ;
-	}
-#Minimum temperature at 2 metres during averaging time
-'Minimum temperature at 2 metres during averaging time' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 202 ;
-	}
 #Runoff
 'Runoff' = {
 	 discipline = 192 ;
 	 parameterCategory = 160 ;
 	 parameterNumber = 205 ;
 	}
-#Standard deviation of geopotential
-'Standard deviation of geopotential' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 206 ;
-	}
 #Covariance of temperature and geopotential
 'Covariance of temperature and geopotential' = {
 	 discipline = 192 ;
 	 parameterCategory = 160 ;
 	 parameterNumber = 207 ;
 	}
-#Standard deviation of temperature
-'Standard deviation of temperature' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 208 ;
-	}
 #Covariance of specific humidity and geopotential
 'Covariance of specific humidity and geopotential' = {
 	 discipline = 192 ;
@@ -17378,12 +17294,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 210 ;
 	}
-#Standard deviation of specific humidity
-'Standard deviation of specific humidity' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 211 ;
-	}
 #Covariance of U component and geopotential
 'Covariance of U component and geopotential' = {
 	 discipline = 192 ;
@@ -17402,12 +17312,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 214 ;
 	}
-#Standard deviation of U velocity
-'Standard deviation of U velocity' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 215 ;
-	}
 #Covariance of V component and geopotential
 'Covariance of V component and geopotential' = {
 	 discipline = 192 ;
@@ -17432,12 +17336,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 219 ;
 	}
-#Standard deviation of V component
-'Standard deviation of V component' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 220 ;
-	}
 #Covariance of W component and geopotential
 'Covariance of W component and geopotential' = {
 	 discipline = 192 ;
@@ -17468,12 +17366,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 225 ;
 	}
-#Standard deviation of vertical velocity
-'Standard deviation of vertical velocity' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 226 ;
-	}
 #Instantaneous surface heat flux
 'Instantaneous surface heat flux' = {
 	 discipline = 192 ;
@@ -19238,18 +19130,6 @@
 	 parameterCategory = 174 ;
 	 parameterNumber = 183 ;
 	}
-#1.5m temperature - maximum in the last 24 hours
-'1.5m temperature - maximum in the last 24 hours' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 201 ;
-	}
-#1.5m temperature - minimum in the last 24 hours
-'1.5m temperature - minimum in the last 24 hours' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 202 ;
-	}
 #Soil temperature layer 4
 'Soil temperature layer 4' = {
 	 discipline = 192 ;
@@ -19412,18 +19292,6 @@
 	 parameterCategory = 175 ;
 	 parameterNumber = 183 ;
 	}
-#1.5m temperature - maximum in the last 24 hours
-'1.5m temperature - maximum in the last 24 hours' = {
-	 discipline = 192 ;
-	 parameterCategory = 175 ;
-	 parameterNumber = 201 ;
-	}
-#1.5m temperature - minimum in the last 24 hours
-'1.5m temperature - minimum in the last 24 hours' = {
-	 discipline = 192 ;
-	 parameterCategory = 175 ;
-	 parameterNumber = 202 ;
-	}
 #Soil temperature layer 4
 'Soil temperature layer 4' = {
 	 discipline = 192 ;
@@ -19910,24 +19778,12 @@
 	 parameterCategory = 201 ;
 	 parameterNumber = 113 ;
 	}
-#deviation of pressure from reference value
-'deviation of pressure from reference value' = {
-	 discipline = 192 ;
-	 parameterCategory = 201 ;
-	 parameterNumber = 139 ;
-	}
 #coefficient of horizontal diffusion
 'coefficient of horizontal diffusion' = {
 	 discipline = 192 ;
 	 parameterCategory = 201 ;
 	 parameterNumber = 150 ;
 	}
-#Maximum wind velocity
-'Maximum wind velocity' = {
-	 discipline = 192 ;
-	 parameterCategory = 201 ;
-	 parameterNumber = 187 ;
-	}
 #water content of interception store
 'water content of interception store' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def
index b4e5a0c5f..8bb06bf69 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.def
@@ -242,18 +242,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 65 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'68' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'69' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 '70' = {
 	 discipline = 192 ;
@@ -1277,18 +1265,6 @@
 	 parameterCategory = 200 ;
 	 parameterNumber = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'200068' = {
-	 discipline = 192 ;
-	 parameterCategory = 200 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'200069' = {
-	 discipline = 192 ;
-	 parameterCategory = 200 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 '200070' = {
 	 discipline = 192 ;
@@ -14524,18 +14500,6 @@
 	 parameterCategory = 129 ;
 	 parameterNumber = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'129068' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'129069' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 '129070' = {
 	 discipline = 192 ;
@@ -17024,30 +16988,6 @@
 	 parameterCategory = 151 ;
 	 parameterNumber = 170 ;
 	}
-#U velocity maximum
-'151171' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 171 ;
-	}
-#Depth of the velocity maximum
-'151172' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 172 ;
-	}
-#Salinity maximum
-'151173' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 173 ;
-	}
-#Depth of salinity maximum
-'151174' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 174 ;
-	}
 #Layer Thickness at scalar points
 '151176' = {
 	 discipline = 192 ;
@@ -17330,42 +17270,18 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 199 ;
 	}
-#Maximum temperature at 2 metres during averaging time
-'160201' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 201 ;
-	}
-#Minimum temperature at 2 metres during averaging time
-'160202' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 202 ;
-	}
 #Runoff
 '160205' = {
 	 discipline = 192 ;
 	 parameterCategory = 160 ;
 	 parameterNumber = 205 ;
 	}
-#Standard deviation of geopotential
-'160206' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 206 ;
-	}
 #Covariance of temperature and geopotential
 '160207' = {
 	 discipline = 192 ;
 	 parameterCategory = 160 ;
 	 parameterNumber = 207 ;
 	}
-#Standard deviation of temperature
-'160208' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 208 ;
-	}
 #Covariance of specific humidity and geopotential
 '160209' = {
 	 discipline = 192 ;
@@ -17378,12 +17294,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 210 ;
 	}
-#Standard deviation of specific humidity
-'160211' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 211 ;
-	}
 #Covariance of U component and geopotential
 '160212' = {
 	 discipline = 192 ;
@@ -17402,12 +17312,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 214 ;
 	}
-#Standard deviation of U velocity
-'160215' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 215 ;
-	}
 #Covariance of V component and geopotential
 '160216' = {
 	 discipline = 192 ;
@@ -17432,12 +17336,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 219 ;
 	}
-#Standard deviation of V component
-'160220' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 220 ;
-	}
 #Covariance of W component and geopotential
 '160221' = {
 	 discipline = 192 ;
@@ -17468,12 +17366,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 225 ;
 	}
-#Standard deviation of vertical velocity
-'160226' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 226 ;
-	}
 #Instantaneous surface heat flux
 '160231' = {
 	 discipline = 192 ;
@@ -19238,18 +19130,6 @@
 	 parameterCategory = 174 ;
 	 parameterNumber = 183 ;
 	}
-#1.5m temperature - maximum in the last 24 hours
-'174201' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 201 ;
-	}
-#1.5m temperature - minimum in the last 24 hours
-'174202' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 202 ;
-	}
 #Soil temperature layer 4
 '174236' = {
 	 discipline = 192 ;
@@ -19412,18 +19292,6 @@
 	 parameterCategory = 175 ;
 	 parameterNumber = 183 ;
 	}
-#1.5m temperature - maximum in the last 24 hours
-'175201' = {
-	 discipline = 192 ;
-	 parameterCategory = 175 ;
-	 parameterNumber = 201 ;
-	}
-#1.5m temperature - minimum in the last 24 hours
-'175202' = {
-	 discipline = 192 ;
-	 parameterCategory = 175 ;
-	 parameterNumber = 202 ;
-	}
 #Soil temperature layer 4
 '175236' = {
 	 discipline = 192 ;
@@ -19910,24 +19778,12 @@
 	 parameterCategory = 201 ;
 	 parameterNumber = 113 ;
 	}
-#deviation of pressure from reference value
-'201139' = {
-	 discipline = 192 ;
-	 parameterCategory = 201 ;
-	 parameterNumber = 139 ;
-	}
 #coefficient of horizontal diffusion
 '201150' = {
 	 discipline = 192 ;
 	 parameterCategory = 201 ;
 	 parameterNumber = 150 ;
 	}
-#Maximum wind velocity
-'201187' = {
-	 discipline = 192 ;
-	 parameterCategory = 201 ;
-	 parameterNumber = 187 ;
-	}
 #water content of interception store
 '201200' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def
index 2f124dd73..2f4055501 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.def
@@ -242,18 +242,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 65 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'msr_lv' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'msr_hv' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 'bc_lv' = {
 	 discipline = 192 ;
@@ -1277,18 +1265,6 @@
 	 parameterCategory = 200 ;
 	 parameterNumber = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 200 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 200 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 '~' = {
 	 discipline = 192 ;
@@ -14524,18 +14500,6 @@
 	 parameterCategory = 129 ;
 	 parameterNumber = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 '~' = {
 	 discipline = 192 ;
@@ -17024,30 +16988,6 @@
 	 parameterCategory = 151 ;
 	 parameterNumber = 170 ;
 	}
-#U velocity maximum
-'umax' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 171 ;
-	}
-#Depth of the velocity maximum
-'dumax' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 172 ;
-	}
-#Salinity maximum
-'smax' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 173 ;
-	}
-#Depth of salinity maximum
-'dsmax' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 174 ;
-	}
 #Layer Thickness at scalar points
 'ldp' = {
 	 discipline = 192 ;
@@ -17330,42 +17270,18 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 199 ;
 	}
-#Maximum temperature at 2 metres during averaging time
-'mx2trea' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 201 ;
-	}
-#Minimum temperature at 2 metres during averaging time
-'mn2trea' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 202 ;
-	}
 #Runoff
 'rorea' = {
 	 discipline = 192 ;
 	 parameterCategory = 160 ;
 	 parameterNumber = 205 ;
 	}
-#Standard deviation of geopotential
-'zzrea' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 206 ;
-	}
 #Covariance of temperature and geopotential
 'tzrea' = {
 	 discipline = 192 ;
 	 parameterCategory = 160 ;
 	 parameterNumber = 207 ;
 	}
-#Standard deviation of temperature
-'ttrea' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 208 ;
-	}
 #Covariance of specific humidity and geopotential
 'qzrea' = {
 	 discipline = 192 ;
@@ -17378,12 +17294,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 210 ;
 	}
-#Standard deviation of specific humidity
-'qqrea' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 211 ;
-	}
 #Covariance of U component and geopotential
 'uzrea' = {
 	 discipline = 192 ;
@@ -17402,12 +17312,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 214 ;
 	}
-#Standard deviation of U velocity
-'uurea' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 215 ;
-	}
 #Covariance of V component and geopotential
 'vzrea' = {
 	 discipline = 192 ;
@@ -17432,12 +17336,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 219 ;
 	}
-#Standard deviation of V component
-'vvrea' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 220 ;
-	}
 #Covariance of W component and geopotential
 'wzrea' = {
 	 discipline = 192 ;
@@ -17468,12 +17366,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 225 ;
 	}
-#Standard deviation of vertical velocity
-'wwrea' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 226 ;
-	}
 #Instantaneous surface heat flux
 'ishfrea' = {
 	 discipline = 192 ;
@@ -19238,18 +19130,6 @@
 	 parameterCategory = 174 ;
 	 parameterNumber = 183 ;
 	}
-#1.5m temperature - maximum in the last 24 hours
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 201 ;
-	}
-#1.5m temperature - minimum in the last 24 hours
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 202 ;
-	}
 #Soil temperature layer 4
 '~' = {
 	 discipline = 192 ;
@@ -19412,18 +19292,6 @@
 	 parameterCategory = 175 ;
 	 parameterNumber = 183 ;
 	}
-#1.5m temperature - maximum in the last 24 hours
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 175 ;
-	 parameterNumber = 201 ;
-	}
-#1.5m temperature - minimum in the last 24 hours
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 175 ;
-	 parameterNumber = 202 ;
-	}
 #Soil temperature layer 4
 '~' = {
 	 discipline = 192 ;
@@ -19910,24 +19778,12 @@
 	 parameterCategory = 201 ;
 	 parameterNumber = 113 ;
 	}
-#deviation of pressure from reference value
-'pp' = {
-	 discipline = 192 ;
-	 parameterCategory = 201 ;
-	 parameterNumber = 139 ;
-	}
 #coefficient of horizontal diffusion
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 201 ;
 	 parameterNumber = 150 ;
 	}
-#Maximum wind velocity
-'vmax_10m' = {
-	 discipline = 192 ;
-	 parameterCategory = 201 ;
-	 parameterNumber = 187 ;
-	}
 #water content of interception store
 'w_i' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def
index c8c65ba8a..642222341 100644
--- a/definitions/grib2/localConcepts/ecmf/units.def
+++ b/definitions/grib2/localConcepts/ecmf/units.def
@@ -242,18 +242,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 65 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'s m**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'s m**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 '(0 - 1)' = {
 	 discipline = 192 ;
@@ -1277,18 +1265,6 @@
 	 parameterCategory = 200 ;
 	 parameterNumber = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'s m**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 200 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'s m**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 200 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 '(0 - 1)' = {
 	 discipline = 192 ;
@@ -14524,18 +14500,6 @@
 	 parameterCategory = 129 ;
 	 parameterNumber = 67 ;
 	}
-#Minimum stomatal resistance, low vegetation
-'s m**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 68 ;
-	}
-#Minimum stomatal resistance, high vegetation
-'s m**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 69 ;
-	}
 #Biome cover, low vegetation
 '(0 - 1)' = {
 	 discipline = 192 ;
@@ -17024,30 +16988,6 @@
 	 parameterCategory = 151 ;
 	 parameterNumber = 170 ;
 	}
-#U velocity maximum
-'m s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 171 ;
-	}
-#Depth of the velocity maximum
-'m' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 172 ;
-	}
-#Salinity maximum
-'psu' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 173 ;
-	}
-#Depth of salinity maximum
-'m' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 174 ;
-	}
 #Layer Thickness at scalar points
 'm' = {
 	 discipline = 192 ;
@@ -17330,42 +17270,18 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 199 ;
 	}
-#Maximum temperature at 2 metres during averaging time
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 201 ;
-	}
-#Minimum temperature at 2 metres during averaging time
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 202 ;
-	}
 #Runoff
 'kg m**-2 s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 160 ;
 	 parameterNumber = 205 ;
 	}
-#Standard deviation of geopotential
-'m**2 s**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 206 ;
-	}
 #Covariance of temperature and geopotential
 'K m**2 s**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 160 ;
 	 parameterNumber = 207 ;
 	}
-#Standard deviation of temperature
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 208 ;
-	}
 #Covariance of specific humidity and geopotential
 'm**2 s**-2' = {
 	 discipline = 192 ;
@@ -17378,12 +17294,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 210 ;
 	}
-#Standard deviation of specific humidity
-'(0 - 1)' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 211 ;
-	}
 #Covariance of U component and geopotential
 'm**3 s**-3' = {
 	 discipline = 192 ;
@@ -17402,12 +17312,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 214 ;
 	}
-#Standard deviation of U velocity
-'m s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 215 ;
-	}
 #Covariance of V component and geopotential
 'm**3 s**-3' = {
 	 discipline = 192 ;
@@ -17432,12 +17336,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 219 ;
 	}
-#Standard deviation of V component
-'m s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 220 ;
-	}
 #Covariance of W component and geopotential
 'Pa m**2 s**-3' = {
 	 discipline = 192 ;
@@ -17468,12 +17366,6 @@
 	 parameterCategory = 160 ;
 	 parameterNumber = 225 ;
 	}
-#Standard deviation of vertical velocity
-'Pa s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 160 ;
-	 parameterNumber = 226 ;
-	}
 #Instantaneous surface heat flux
 'J m**-2' = {
 	 discipline = 192 ;
@@ -18759,13 +18651,13 @@
 	 parameterNumber = 255 ;
 	}
 #Snow evaporation
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 44 ;
 	}
 #Snowmelt
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
@@ -18855,13 +18747,13 @@
 	 parameterNumber = 255 ;
 	}
 #Snow evaporation anomaly
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
 	 parameterNumber = 44 ;
 	}
 #Snowmelt anomaly
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
 	 parameterNumber = 45 ;
@@ -18981,7 +18873,7 @@
 	 parameterNumber = 181 ;
 	}
 #Evaporation anomalous rate of accumulation
-'m of water s**-1' = {
+'m of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
 	 parameterNumber = 182 ;
@@ -19238,18 +19130,6 @@
 	 parameterCategory = 174 ;
 	 parameterNumber = 183 ;
 	}
-#1.5m temperature - maximum in the last 24 hours
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 201 ;
-	}
-#1.5m temperature - minimum in the last 24 hours
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 202 ;
-	}
 #Soil temperature layer 4
 'K' = {
 	 discipline = 192 ;
@@ -19412,18 +19292,6 @@
 	 parameterCategory = 175 ;
 	 parameterNumber = 183 ;
 	}
-#1.5m temperature - maximum in the last 24 hours
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 175 ;
-	 parameterNumber = 201 ;
-	}
-#1.5m temperature - minimum in the last 24 hours
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 175 ;
-	 parameterNumber = 202 ;
-	}
 #Soil temperature layer 4
 'K' = {
 	 discipline = 192 ;
@@ -19910,24 +19778,12 @@
 	 parameterCategory = 201 ;
 	 parameterNumber = 113 ;
 	}
-#deviation of pressure from reference value
-'Pa' = {
-	 discipline = 192 ;
-	 parameterCategory = 201 ;
-	 parameterNumber = 139 ;
-	}
 #coefficient of horizontal diffusion
 'm**2 s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 201 ;
 	 parameterNumber = 150 ;
 	}
-#Maximum wind velocity
-'m s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 201 ;
-	 parameterNumber = 187 ;
-	}
 #water content of interception store
 'kg m**-2' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
index ba2128aa3..3ac979f33 100644
--- a/definitions/grib2/name.def
+++ b/definitions/grib2/name.def
@@ -5944,12 +5944,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 13 ;
 	}
-#Minimum dew point depression
-'Minimum dew point depression' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 14 ;
-	}
 #Snow phase change heat flux
 'Snow phase change heat flux' = {
 	 discipline = 0 ;
@@ -6046,18 +6040,6 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 26 ;
 	}
-#Maximum relative humidity
-'Maximum relative humidity' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 27 ;
-	}
-#Maximum absolute humidity
-'Maximum absolute humidity' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 28 ;
-	}
 #Total snowfall
 'Total snowfall' = {
 	 discipline = 0 ;
@@ -6265,12 +6247,6 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 68 ;
 	}
-#Maximum wind speed
-'Maximum wind speed' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 21 ;
-	}
 #Wind speed (gust)
 'Wind speed (gust)' = {
 	 discipline = 0 ;
@@ -6820,12 +6796,6 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 16 ;
 	}
-#Maximum snow albedo
-'Maximum snow albedo' = {
-	 discipline = 0 ;
-	 parameterCategory = 19 ;
-	 parameterNumber = 17 ;
-	}
 #Snow free albedo
 'Snow free albedo' = {
 	 discipline = 0 ;
@@ -10768,18 +10738,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 3 ;
 	}
-#Maximum temperature
-'Maximum temperature' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 4 ;
-	}
-#Minimum temperature
-'Minimum temperature' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 5 ;
-	}
 #Dew point temperature
 'Dew point temperature' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
index 559dfa569..bf4f0fd51 100644
--- a/definitions/grib2/paramId.def
+++ b/definitions/grib2/paramId.def
@@ -5944,12 +5944,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 13 ;
 	}
-#Minimum dew point depression
-'260006' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 14 ;
-	}
 #Snow phase change heat flux
 '260007' = {
 	 discipline = 0 ;
@@ -6046,18 +6040,6 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 26 ;
 	}
-#Maximum relative humidity
-'260023' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 27 ;
-	}
-#Maximum absolute humidity
-'260024' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 28 ;
-	}
 #Total snowfall
 '260025' = {
 	 discipline = 0 ;
@@ -6265,12 +6247,6 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 68 ;
 	}
-#Maximum wind speed
-'260064' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 21 ;
-	}
 #Wind speed (gust)
 '260065' = {
 	 discipline = 0 ;
@@ -6820,12 +6796,6 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 16 ;
 	}
-#Maximum snow albedo
-'260161' = {
-	 discipline = 0 ;
-	 parameterCategory = 19 ;
-	 parameterNumber = 17 ;
-	}
 #Snow free albedo
 '260162' = {
 	 discipline = 0 ;
@@ -10768,18 +10738,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 3 ;
 	}
-#Maximum temperature
-'3015' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 4 ;
-	}
-#Minimum temperature
-'3016' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 5 ;
-	}
 #Dew point temperature
 '3017' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
index d3938a656..13c68c8a1 100644
--- a/definitions/grib2/shortName.def
+++ b/definitions/grib2/shortName.def
@@ -5944,12 +5944,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 13 ;
 	}
-#Minimum dew point depression
-'mindpd' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 14 ;
-	}
 #Snow phase change heat flux
 'snohf' = {
 	 discipline = 0 ;
@@ -6046,18 +6040,6 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 26 ;
 	}
-#Maximum relative humidity
-'maxrh' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 27 ;
-	}
-#Maximum absolute humidity
-'maxah' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 28 ;
-	}
 #Total snowfall
 'asnow' = {
 	 discipline = 0 ;
@@ -6265,12 +6247,6 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 68 ;
 	}
-#Maximum wind speed
-'maxgust' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 21 ;
-	}
 #Wind speed (gust)
 'gust' = {
 	 discipline = 0 ;
@@ -6820,12 +6796,6 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 16 ;
 	}
-#Maximum snow albedo
-'mxsalb' = {
-	 discipline = 0 ;
-	 parameterCategory = 19 ;
-	 parameterNumber = 17 ;
-	}
 #Snow free albedo
 'snfalb' = {
 	 discipline = 0 ;
@@ -10768,18 +10738,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 3 ;
 	}
-#Maximum temperature
-'tmax' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 4 ;
-	}
-#Minimum temperature
-'tmin' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 5 ;
-	}
 #Dew point temperature
 'dpt' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
index d71fda3c2..535b1caae 100644
--- a/definitions/grib2/units.def
+++ b/definitions/grib2/units.def
@@ -5944,12 +5944,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 13 ;
 	}
-#Minimum dew point depression
-'K' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 14 ;
-	}
 #Snow phase change heat flux
 'W m**-2' = {
 	 discipline = 0 ;
@@ -6046,18 +6040,6 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 26 ;
 	}
-#Maximum relative humidity
-'%' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 27 ;
-	}
-#Maximum absolute humidity
-'kg m**-3' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 28 ;
-	}
 #Total snowfall
 'm' = {
 	 discipline = 0 ;
@@ -6265,12 +6247,6 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 68 ;
 	}
-#Maximum wind speed
-'m s**-1' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 21 ;
-	}
 #Wind speed (gust)
 'm s**-1' = {
 	 discipline = 0 ;
@@ -6820,12 +6796,6 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 16 ;
 	}
-#Maximum snow albedo
-'%' = {
-	 discipline = 0 ;
-	 parameterCategory = 19 ;
-	 parameterNumber = 17 ;
-	}
 #Snow free albedo
 '%' = {
 	 discipline = 0 ;
@@ -10768,18 +10738,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 3 ;
 	}
-#Maximum temperature
-'K' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 4 ;
-	}
-#Minimum temperature
-'K' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 5 ;
-	}
 #Dew point temperature
 'K' = {
 	 discipline = 0 ;