diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def
index 73d0793a0..668b0115f 100644
--- a/definitions/grib2/localConcepts/ecmf/cfVarName.def
+++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def
@@ -793,24 +793,12 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 128 ;
 	}
-#Geopotential
-'z' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 4 ;
-	}
 #Total column water vapour
 'tcwv' = {
 	 discipline = 192 ;
 	 parameterCategory = 128 ;
 	 parameterNumber = 137 ;
 	}
-#Vorticity (relative)
-'vo' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 12 ;
-	}
 #Soil temperature level 1
 'stl1' = {
 	 discipline = 192 ;
@@ -849,12 +837,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 144 ;
 	}
-#Boundary layer dissipation
-'bld' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Charnock
 'chnk' = {
 	 discipline = 192 ;
@@ -892,18 +874,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 154 ;
 	}
-#Divergence
-'d' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 13 ;
-	}
-#Relative humidity
-'r' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 1 ;
-	}
 #Tendency of surface pressure
 'tsp' = {
 	 discipline = 192 ;
@@ -946,24 +916,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 164 ;
 	}
-#10 metre U wind component
-'u10' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 2 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	}
-#10 metre V wind component
-'v10' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 3 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	}
 #Surface solar radiation downwards
 'ssrd' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def
index a99d83722..8d7627a98 100644
--- a/definitions/grib2/localConcepts/ecmf/name.def
+++ b/definitions/grib2/localConcepts/ecmf/name.def
@@ -793,24 +793,12 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 128 ;
 	}
-#Geopotential
-'Geopotential' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 4 ;
-	}
 #Total column water vapour
 'Total column water vapour' = {
 	 discipline = 192 ;
 	 parameterCategory = 128 ;
 	 parameterNumber = 137 ;
 	}
-#Vorticity (relative)
-'Vorticity (relative)' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 12 ;
-	}
 #Soil temperature level 1
 'Soil temperature level 1' = {
 	 discipline = 192 ;
@@ -849,12 +837,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 144 ;
 	}
-#Boundary layer dissipation
-'Boundary layer dissipation' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Charnock
 'Charnock' = {
 	 discipline = 192 ;
@@ -892,18 +874,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 154 ;
 	}
-#Divergence
-'Divergence' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 13 ;
-	}
-#Relative humidity
-'Relative humidity' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 1 ;
-	}
 #Tendency of surface pressure
 'Tendency of surface pressure' = {
 	 discipline = 192 ;
@@ -946,24 +916,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 164 ;
 	}
-#10 metre U wind component
-'10 metre U wind component' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	}
-#10 metre V wind component
-'10 metre V wind component' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 3 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	}
 #Surface solar radiation downwards
 'Surface solar radiation downwards' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def
index a5b0f92be..029c843f8 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.def
@@ -793,24 +793,12 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 128 ;
 	}
-#Geopotential
-'129' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 4 ;
-	}
 #Total column water vapour
 '137' = {
 	 discipline = 192 ;
 	 parameterCategory = 128 ;
 	 parameterNumber = 137 ;
 	}
-#Vorticity (relative)
-'138' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 12 ;
-	}
 #Soil temperature level 1
 '139' = {
 	 discipline = 192 ;
@@ -849,12 +837,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 144 ;
 	}
-#Boundary layer dissipation
-'145' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Charnock
 '148' = {
 	 discipline = 192 ;
@@ -892,18 +874,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 154 ;
 	}
-#Divergence
-'155' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 13 ;
-	}
-#Relative humidity
-'157' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 1 ;
-	}
 #Tendency of surface pressure
 '158' = {
 	 discipline = 192 ;
@@ -946,24 +916,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 164 ;
 	}
-#10 metre U wind component
-'165' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 2 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	}
-#10 metre V wind component
-'166' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 3 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	}
 #Surface solar radiation downwards
 '169' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def
index 17924f364..da8618a95 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.def
@@ -793,24 +793,12 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 128 ;
 	}
-#Geopotential
-'z' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 4 ;
-	}
 #Total column water vapour
 'tcwv' = {
 	 discipline = 192 ;
 	 parameterCategory = 128 ;
 	 parameterNumber = 137 ;
 	}
-#Vorticity (relative)
-'vo' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 12 ;
-	}
 #Soil temperature level 1
 'stl1' = {
 	 discipline = 192 ;
@@ -849,12 +837,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 144 ;
 	}
-#Boundary layer dissipation
-'bld' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Charnock
 'chnk' = {
 	 discipline = 192 ;
@@ -892,18 +874,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 154 ;
 	}
-#Divergence
-'d' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 13 ;
-	}
-#Relative humidity
-'r' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 1 ;
-	}
 #Tendency of surface pressure
 'tsp' = {
 	 discipline = 192 ;
@@ -946,24 +916,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 164 ;
 	}
-#10 metre U wind component
-'10u' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 2 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	}
-#10 metre V wind component
-'10v' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 3 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	}
 #Surface solar radiation downwards
 'ssrd' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def
index 870a55413..7b659af07 100644
--- a/definitions/grib2/localConcepts/ecmf/units.def
+++ b/definitions/grib2/localConcepts/ecmf/units.def
@@ -793,24 +793,12 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 128 ;
 	}
-#Geopotential
-'m**2 s**-2' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 4 ;
-	}
 #Total column water vapour
 'kg m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 128 ;
 	 parameterNumber = 137 ;
 	}
-#Vorticity (relative)
-'s**-1' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 12 ;
-	}
 #Soil temperature level 1
 'K' = {
 	 discipline = 192 ;
@@ -849,12 +837,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 144 ;
 	}
-#Boundary layer dissipation
-'J m**-2' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Charnock
 '~' = {
 	 discipline = 192 ;
@@ -892,18 +874,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 154 ;
 	}
-#Divergence
-'s**-1' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 13 ;
-	}
-#Relative humidity
-'%' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 1 ;
-	}
 #Tendency of surface pressure
 'Pa s**-1' = {
 	 discipline = 192 ;
@@ -946,24 +916,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 164 ;
 	}
-#10 metre U wind component
-'m s**-1' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	}
-#10 metre V wind component
-'m s**-1' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 3 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	}
 #Surface solar radiation downwards
 'J m**-2' = {
 	 discipline = 192 ;