diff --git a/definitions/add_params_from_tsv.pl b/definitions/add_params_from_tsv.pl
index 5206c40de..099f79a9c 100755
--- a/definitions/add_params_from_tsv.pl
+++ b/definitions/add_params_from_tsv.pl
@@ -21,13 +21,15 @@
 #   parameterCategory
 #   parameterNumber
 #   # The following are optional keys
-#   typeOfFirstFixedSurface
-#   scaleFactorOfFirstFixedSurface
-#   scaledValueOfFirstFixedSurface
-#   typeOfSecondFixedSurface
-#   scaleFactorOfSecondFixedSurface
-#   scaledValueOfSecondFixedSurface
-#   typeOfStatisticalProcessing
+#    typeOfFirstFixedSurface
+#    scaleFactorOfFirstFixedSurface
+#    scaledValueOfFirstFixedSurface
+#    typeOfSecondFixedSurface
+#    scaleFactorOfSecondFixedSurface
+#    scaledValueOfSecondFixedSurface
+#    typeOfStatisticalProcessing
+#    aerosolType
+#    constituentType
 #
 # It outputs the def files:
 #    name.def paramId.def shortName.def units.def cfVarName.def
@@ -45,7 +47,8 @@ my $WRITE_TO_FILES = 0;
 my $WRITE_TO_PARAMDB = 0;
 
 my ($paramId, $shortName, $name, $units, $cfVarName);
-my ($discipline, $pcategory, $pnumber, $type1, $type2, $scaledValue1, $scaleFactor1, $scaledValue2, $scaleFactor2, $stat);
+my ($discipline, $pcategory, $pnumber, $type1, $type2, $scaledValue1, $scaleFactor1, $scaledValue2, $scaleFactor2);
+my ($stat, $aero, $constit);
 
 my %key_to_attrib_map = (
     'discipline'         => 4,
@@ -94,6 +97,7 @@ if ($WRITE_TO_PARAMDB) {
 }
 
 my $first = 1;
+my $lcount = 0;
 while (<>) {
     chomp;
     s/\r//g;  # Remove DOS carriage returns
@@ -102,10 +106,11 @@ while (<>) {
         $first = 0;
         next;
     }
+    $lcount++;
 
     ($paramId, $shortName, $name, $units,
         $discipline, $pcategory, $pnumber, $type1, $type2,
-        $scaledValue1, $scaleFactor1, $scaledValue2, $scaleFactor2, $stat) = split(/\t/);
+        $scaledValue1, $scaleFactor1, $scaledValue2, $scaleFactor2, $stat, $aero, $constit) = split(/\t/);
 
     die "Error: paramID \"$paramId\" is not an integer!" if (!is_integer($paramId));
 
@@ -123,28 +128,32 @@ while (<>) {
 
     if ($WRITE_TO_PARAMDB) {
         my $units_code = get_db_units_code($units);
-        my $is_chem = "y";
-        my $is_aero = "y";
+        my $is_chem = "1";
+        my $is_aero = "";
         $dbh->do("insert into param(id,shortName,name,units_id,insert_date,update_date,contact) values (?,?,?,?,?,?,?)",undef,
             $paramId, $shortName, $name , $units_code, $today_date, $today_date, $contactId);
 
-      # Table 'grib' columns: param_id  edition  centre  attribute_id  attribute_value  param_version
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,4, $discipline,0);
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,8, $pcategory,0);
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,5, $pnumber,0);
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,6, $type1,0)        if ($type1 ne "");
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,13,$type2,0)        if ($type2 ne "");
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,9, $scaledValue1,0) if ($scaledValue1 ne "");
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,7, $scaleFactor1,0) if ($scaleFactor1 ne "");
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,14,$scaledValue2,0) if ($scaledValue2 ne "");
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,15,$scaleFactor2,0) if ($scaleFactor2 ne "");
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,11,$stat,0)         if ($stat ne "");
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,53,$is_chem,0)      if ($is_chem ne "");
-      $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,54,$is_aero,0)      if ($is_aero ne "");
-      #$dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,yy,xx,0) if (xx ne "");
+        # Table 'grib' columns: param_id  edition  centre  attribute_id  attribute_value  param_version
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,4, $discipline,0);
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,8, $pcategory,0);
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,5, $pnumber,0);
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,6, $type1,0)        if ($type1 ne "");
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,13,$type2,0)        if ($type2 ne "");
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,9, $scaledValue1,0) if ($scaledValue1 ne "");
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,7, $scaleFactor1,0) if ($scaleFactor1 ne "");
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,14,$scaledValue2,0) if ($scaledValue2 ne "");
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,15,$scaleFactor2,0) if ($scaleFactor2 ne "");
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,11,$stat,0)         if ($stat ne "");
 
-      # format is only GRIB2
-      $dbh->do("insert into param_format(param_id,grib1,grib2) values (?,?,?)",undef,$paramId,0,1);
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,46,$aero,0)         if ($aero ne "");
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,40,$constit,0)      if ($constit ne "");
+
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,53,$is_chem,0)      if ($is_chem ne "");
+        $dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,54,$is_aero,0)      if ($is_aero ne "");
+        #$dbh->do("insert into grib values (?,?,?,?,?,?)",undef, $paramId,$edition,$centre,yy,xx,0) if (xx ne "");
+
+        # format is only GRIB2
+        $dbh->do("insert into param_format(param_id,grib1,grib2) values (?,?,?)",undef,$paramId,0,1);
     }
 } # for each input line
 
@@ -156,6 +165,9 @@ if ($WRITE_TO_FILES) {
     close(OUT_UNITS)     or die "$UNITS_FILENAME: $!";
     close(OUT_CFVARNAME) or die "$CFVARNAME_FILENAME: $!";
 }
+if ($WRITE_TO_PARAMDB) {
+    print "Wrote to Param DB. $lcount rows processed\n";
+}
 
 # -------------------------------------------------------------------
 sub get_db_units_code {
@@ -240,6 +252,9 @@ sub check_first_row_column_names {
     die "Error: 1st row column titles wrong: Column 12 should be 'scaleFactorOfSecondFixedSurface'\n" if ($keys[11] ne "scaleFactorOfSecondFixedSurface");
     die "Error: 1st row column titles wrong: Column 13 should be 'scaledValueOfSecondFixedSurface'\n" if ($keys[12] ne "scaledValueOfSecondFixedSurface");
     die "Error: 1st row column titles wrong: Column 14 should be 'typeOfStatisticalProcessing'\n" if ($keys[13] ne "typeOfStatisticalProcessing");
+
+    die "Error: 1st row column titles wrong: Column 15 should be 'aerosolType'\n" if ($keys[14] ne "aerosolType");
+    die "Error: 1st row column titles wrong: Column 16 should be 'constituentType'\n" if ($keys[15] ne "constituentType");
 }
 
 sub create_or_append {
diff --git a/definitions/grib3/local.98.11.def b/definitions/grib3/local.98.11.def
index 7c91145af..dca733381 100644
--- a/definitions/grib3/local.98.11.def
+++ b/definitions/grib3/local.98.11.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Definition 11, Supplementary data used by the analysis
 
diff --git a/definitions/grib3/local.98.14.def b/definitions/grib3/local.98.14.def
index 68a8514e4..dd84238a9 100644
--- a/definitions/grib3/local.98.14.def
+++ b/definitions/grib3/local.98.14.def
@@ -1,11 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Definition 14, Brightness temperature
 
diff --git a/definitions/grib3/local.98.15.def b/definitions/grib3/local.98.15.def
index ec0d61722..44082119f 100644
--- a/definitions/grib3/local.98.15.def
+++ b/definitions/grib3/local.98.15.def
@@ -1,11 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 
 unsigned[2] systemNumber : dump ;
diff --git a/definitions/grib3/local.98.16.def b/definitions/grib3/local.98.16.def
index 1b2da664a..e38f220b8 100644
--- a/definitions/grib3/local.98.16.def
+++ b/definitions/grib3/local.98.16.def
@@ -1,12 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 
 unsigned[2] systemNumber : dump ;
 unsigned[2] methodNumber : dump ;
diff --git a/definitions/grib3/local.98.18.def b/definitions/grib3/local.98.18.def
index 786005b2b..625bab5e8 100644
--- a/definitions/grib3/local.98.18.def
+++ b/definitions/grib3/local.98.18.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 codetable[1] dataOrigin "grib1/0.table" : dump;
 alias mars.origin=dataOrigin;
diff --git a/definitions/grib3/local.98.192.def b/definitions/grib3/local.98.192.def
index 32ff0645d..c2eb7b1b5 100644
--- a/definitions/grib3/local.98.192.def
+++ b/definitions/grib3/local.98.192.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # GRIB3 Local Definition 192: Multiple ECMWF local definitions
 
diff --git a/definitions/grib3/local.98.20.def b/definitions/grib3/local.98.20.def
index 2df29e302..534e9c34e 100644
--- a/definitions/grib3/local.98.20.def
+++ b/definitions/grib3/local.98.20.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 unsigned[1] iterationNumber  : dump;
 alias number=iterationNumber;
diff --git a/definitions/grib3/local.98.21.def b/definitions/grib3/local.98.21.def
index 2321c07b6..1bc85bbcc 100644
--- a/definitions/grib3/local.98.21.def
+++ b/definitions/grib3/local.98.21.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Definition 21 - Sensitive area predictions 
 
diff --git a/definitions/grib3/local.98.24.def b/definitions/grib3/local.98.24.def
index b3cd50d33..f5813cddc 100644
--- a/definitions/grib3/local.98.24.def
+++ b/definitions/grib3/local.98.24.def
@@ -1,11 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 unsigned[2] channelNumber : dump, can_be_missing;
 alias mars.channel = channelNumber;
diff --git a/definitions/grib3/local.98.25.def b/definitions/grib3/local.98.25.def
index 7339ad9b2..80971f450 100644
--- a/definitions/grib3/local.98.25.def
+++ b/definitions/grib3/local.98.25.def
@@ -1,11 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 unsigned[1] componentIndex  : dump;
 alias mars.number=componentIndex;
diff --git a/definitions/grib3/local.98.26.def b/definitions/grib3/local.98.26.def
index 6f7a3f709..9e7fbfee2 100644
--- a/definitions/grib3/local.98.26.def
+++ b/definitions/grib3/local.98.26.def
@@ -1,11 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 unsigned[4] referenceDate  : dump ;
 unsigned[4] climateDateFrom  : dump;
diff --git a/definitions/grib3/local.98.28.def b/definitions/grib3/local.98.28.def
index fa52aa684..9e54e5059 100644
--- a/definitions/grib3/local.98.28.def
+++ b/definitions/grib3/local.98.28.def
@@ -1,11 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 # Definition 28 - COSMO local area EPS
 
 unsigned[4] baseDateEPS : dump;
diff --git a/definitions/grib3/local.98.30.def b/definitions/grib3/local.98.30.def
index 40a2e29f9..c79663bf0 100644
--- a/definitions/grib3/local.98.30.def
+++ b/definitions/grib3/local.98.30.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 unsigned[1] oceanAtmosphereCoupling : dump;
 
diff --git a/definitions/grib3/local.98.300.def b/definitions/grib3/local.98.300.def
index acb997945..c80fbf3bc 100644
--- a/definitions/grib3/local.98.300.def
+++ b/definitions/grib3/local.98.300.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Definition 300 - Multi-dimensional parameters
 
diff --git a/definitions/grib3/local.98.36.def b/definitions/grib3/local.98.36.def
index cd148bdc7..57dcc33ca 100644
--- a/definitions/grib3/local.98.36.def
+++ b/definitions/grib3/local.98.36.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Definition 36 - MARS labelling for long window 4Dvar system (inspired by local def 1)
 
diff --git a/definitions/grib3/local.98.38.def b/definitions/grib3/local.98.38.def
index e912bdb46..1de8167d8 100644
--- a/definitions/grib3/local.98.38.def
+++ b/definitions/grib3/local.98.38.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Definition 38 - 4D variational increments for long window 4Dvar system (inspired by local def 20)
 
diff --git a/definitions/grib3/local.98.39.def b/definitions/grib3/local.98.39.def
index 9be03b61a..b37fb2719 100644
--- a/definitions/grib3/local.98.39.def
+++ b/definitions/grib3/local.98.39.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Definition 39 - 4DVar model errors for long window 4Dvar system (inspired by local def 25)
 
diff --git a/definitions/grib3/local.98.7.def b/definitions/grib3/local.98.7.def
index e321ef80b..70d3dcf6d 100644
--- a/definitions/grib3/local.98.7.def
+++ b/definitions/grib3/local.98.7.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 unsigned[1] iterationNumber  : dump;
 alias number=iterationNumber;
diff --git a/definitions/grib3/local.98.9.def b/definitions/grib3/local.98.9.def
index 0a288c2e1..8a2baa606 100644
--- a/definitions/grib3/local.98.9.def
+++ b/definitions/grib3/local.98.9.def
@@ -1,12 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 
 unsigned[2] forecastOrSingularVectorNumber  : dump;
 
diff --git a/definitions/grib3/mars_labeling.def b/definitions/grib3/mars_labeling.def
index f542ecb7f..6905210ce 100644
--- a/definitions/grib3/mars_labeling.def
+++ b/definitions/grib3/mars_labeling.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 codetable[2] marsClass   "mars/class.table" = "od" : dump,string_type,lowercase;
 codetable[2] marsType   "mars/type.table" = "an"  : dump,string_type,no_fail,lowercase;
diff --git a/definitions/grib3/meta.def b/definitions/grib3/meta.def
index eb3ab581c..add27a592 100644
--- a/definitions/grib3/meta.def
+++ b/definitions/grib3/meta.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 label "Empty file";
 
diff --git a/definitions/grib3/parameters.def b/definitions/grib3/parameters.def
index e7cea2eb2..907431c7b 100644
--- a/definitions/grib3/parameters.def
+++ b/definitions/grib3/parameters.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 transient dummyc=0: hidden;
 constant conceptsMasterDir="grib3" : hidden;
diff --git a/definitions/grib3/products_0.def b/definitions/grib3/products_0.def
index 4bf54ef1e..1f9241931 100644
--- a/definitions/grib3/products_0.def
+++ b/definitions/grib3/products_0.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Operational products
 
diff --git a/definitions/grib3/products_1.def b/definitions/grib3/products_1.def
index 9688c57e7..a33b7f5d6 100644
--- a/definitions/grib3/products_1.def
+++ b/definitions/grib3/products_1.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Operationl test products
 
diff --git a/definitions/grib3/products_2.def b/definitions/grib3/products_2.def
index 65a7fcd95..703c2c22d 100644
--- a/definitions/grib3/products_2.def
+++ b/definitions/grib3/products_2.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Research products
 
diff --git a/definitions/grib3/products_3.def b/definitions/grib3/products_3.def
index bc11b6373..cb87096dc 100644
--- a/definitions/grib3/products_3.def
+++ b/definitions/grib3/products_3.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Re-analysis products
 
diff --git a/definitions/grib3/products_4.def b/definitions/grib3/products_4.def
index fceae7af2..1063079ff 100644
--- a/definitions/grib3/products_4.def
+++ b/definitions/grib3/products_4.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Tigge
 constant marsExpver = 'prod';
diff --git a/definitions/grib3/products_5.def b/definitions/grib3/products_5.def
index 0439382ae..ec9ddf0c5 100644
--- a/definitions/grib3/products_5.def
+++ b/definitions/grib3/products_5.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Tigge
 constant marsExpver = 'test';
diff --git a/definitions/grib3/products_6.def b/definitions/grib3/products_6.def
index 2a0d5472f..94dbbeb6f 100644
--- a/definitions/grib3/products_6.def
+++ b/definitions/grib3/products_6.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # S2S
 constant marsExpver = 'prod';
diff --git a/definitions/grib3/products_7.def b/definitions/grib3/products_7.def
index 8d697f089..d303f7c46 100644
--- a/definitions/grib3/products_7.def
+++ b/definitions/grib3/products_7.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # S2S test
 constant marsExpver = 'test';
diff --git a/definitions/grib3/products_8.def b/definitions/grib3/products_8.def
index fbbc2f856..162021989 100644
--- a/definitions/grib3/products_8.def
+++ b/definitions/grib3/products_8.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Uncertainties in ensembles of regional re-analysis project (UERRA)
 constant marsExpver = 'prod';
diff --git a/definitions/grib3/products_9.def b/definitions/grib3/products_9.def
index 83b4b464b..86b6f808d 100644
--- a/definitions/grib3/products_9.def
+++ b/definitions/grib3/products_9.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Uncertainties in ensembles of regional re-analysis project test (UERRA)
 constant marsExpver = 'test';
diff --git a/definitions/grib3/products_s2s.def b/definitions/grib3/products_s2s.def
index 7d1dd7720..9afaa32a4 100644
--- a/definitions/grib3/products_s2s.def
+++ b/definitions/grib3/products_s2s.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # S2S
 constant marsClass  = 's2';
diff --git a/definitions/grib3/products_tigge.def b/definitions/grib3/products_tigge.def
index bc1028008..9a3a4ae81 100644
--- a/definitions/grib3/products_tigge.def
+++ b/definitions/grib3/products_tigge.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Tigge
 constant marsClass = 'ti';
diff --git a/definitions/grib3/products_uerra.def b/definitions/grib3/products_uerra.def
index 82289f687..7338e8d6d 100644
--- a/definitions/grib3/products_uerra.def
+++ b/definitions/grib3/products_uerra.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Uncertainties in ensembles of regional re-analysis project (UERRA)
 constant marsClass = 'ur';
diff --git a/definitions/grib3/rules.def b/definitions/grib3/rules.def
index de8932e55..c1f74af5d 100644
--- a/definitions/grib3/rules.def
+++ b/definitions/grib3/rules.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Experimental stuff
 
diff --git a/definitions/grib3/section.00.def b/definitions/grib3/section.00.def
index bc68175bb..548bd86f9 100644
--- a/definitions/grib3/section.00.def
+++ b/definitions/grib3/section.00.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 0 - Indicator Section
 
diff --git a/definitions/grib3/section.01.def b/definitions/grib3/section.01.def
index 5bde245b5..a40f454e4 100644
--- a/definitions/grib3/section.01.def
+++ b/definitions/grib3/section.01.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 1 - Originator Section
 
diff --git a/definitions/grib3/section.02.def b/definitions/grib3/section.02.def
index 8368b8c2d..02c0f5ec5 100644
--- a/definitions/grib3/section.02.def
+++ b/definitions/grib3/section.02.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 2 - Repetitions and Index Section
 
diff --git a/definitions/grib3/section.03.def b/definitions/grib3/section.03.def
index 16ddc6bc0..5c9c9e9f4 100644
--- a/definitions/grib3/section.03.def
+++ b/definitions/grib3/section.03.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 3 - Time Domain Section
 
diff --git a/definitions/grib3/section.04.def b/definitions/grib3/section.04.def
index fe8d01494..e43305bde 100644
--- a/definitions/grib3/section.04.def
+++ b/definitions/grib3/section.04.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 4 - Horizontal Domain Section
 
diff --git a/definitions/grib3/section.05.def b/definitions/grib3/section.05.def
index 1cd85ec84..0b29d8348 100644
--- a/definitions/grib3/section.05.def
+++ b/definitions/grib3/section.05.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 5 - Vertical Domain Section
 
diff --git a/definitions/grib3/section.06.def b/definitions/grib3/section.06.def
index 59db019e2..89e1ad4c4 100644
--- a/definitions/grib3/section.06.def
+++ b/definitions/grib3/section.06.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 6 - Generating Process Section
 
diff --git a/definitions/grib3/section.07.def b/definitions/grib3/section.07.def
index 5ac66dbad..574a30483 100644
--- a/definitions/grib3/section.07.def
+++ b/definitions/grib3/section.07.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 7 - Observable Property Section
 
diff --git a/definitions/grib3/section.08.def b/definitions/grib3/section.08.def
index 90838fa71..3e7773dc6 100644
--- a/definitions/grib3/section.08.def
+++ b/definitions/grib3/section.08.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 8 - Data Representation Section
 
diff --git a/definitions/grib3/section.09.def b/definitions/grib3/section.09.def
index 8c4234835..f90499c37 100644
--- a/definitions/grib3/section.09.def
+++ b/definitions/grib3/section.09.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 9 - Overlay Section
 
diff --git a/definitions/grib3/section.10.def b/definitions/grib3/section.10.def
index ff53c3e75..af2826840 100644
--- a/definitions/grib3/section.10.def
+++ b/definitions/grib3/section.10.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # Section 10 - Data Section
 
diff --git a/definitions/grib3/section.11.def b/definitions/grib3/section.11.def
index 2c6bd14c5..af847a6fc 100644
--- a/definitions/grib3/section.11.def
+++ b/definitions/grib3/section.11.def
@@ -1,11 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 # Section 11 - End Section
 constant section11Length=4;
 position offsetSection11;
diff --git a/definitions/grib3/sections.def b/definitions/grib3/sections.def
index 313b93b7c..197678d96 100644
--- a/definitions/grib3/sections.def
+++ b/definitions/grib3/sections.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # The section number is always 1 byte and at the 5th byte of each section (so offset=4)
 
diff --git a/definitions/grib3/template.10.0.def b/definitions/grib3/template.10.0.def
index 96685a9cb..c6a432cec 100644
--- a/definitions/grib3/template.10.0.def
+++ b/definitions/grib3/template.10.0.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 10.0, Grid point data - simple packing
 # Octets 6-nn : Binary data values - binary string, with each
diff --git a/definitions/grib3/template.3.0.def b/definitions/grib3/template.3.0.def
index bf36bce18..9a151d7db 100644
--- a/definitions/grib3/template.3.0.def
+++ b/definitions/grib3/template.3.0.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 3.0, Forecast point in time
 
diff --git a/definitions/grib3/template.3.110.def b/definitions/grib3/template.3.110.def
index 3f8676a3a..d0f37c35a 100644
--- a/definitions/grib3/template.3.110.def
+++ b/definitions/grib3/template.3.110.def
@@ -1,12 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 
 # TEMPLATE 3.110, Equatorial azimuthal equidistant projection
 include "grib3/template.3.shape_of_the_earth.def";
diff --git a/definitions/grib3/template.3.140.def b/definitions/grib3/template.3.140.def
index 17f417de1..b5d9d023d 100644
--- a/definitions/grib3/template.3.140.def
+++ b/definitions/grib3/template.3.140.def
@@ -1,12 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 
 # START 2/template.3.140 ----------------------------------------------------------------------
 # TEMPLATE 3.140, Lambert azimuthal equal area projection
diff --git a/definitions/grib3/template.3.20.def b/definitions/grib3/template.3.20.def
index 33be66ba6..2ba66029a 100644
--- a/definitions/grib3/template.3.20.def
+++ b/definitions/grib3/template.3.20.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 
 # START 2/template.3.20 ----------------------------------------------------------------------
diff --git a/definitions/grib3/template.3.resolution_flags.def b/definitions/grib3/template.3.resolution_flags.def
index bdc55846f..759ad5d0e 100644
--- a/definitions/grib3/template.3.resolution_flags.def
+++ b/definitions/grib3/template.3.resolution_flags.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 #  Resolution and component flags
 flags[1] resolutionAndComponentFlags 'grib3/tables/[tablesVersion]/3.3.table' : edition_specific,no_copy;
diff --git a/definitions/grib3/template.4.0.def b/definitions/grib3/template.4.0.def
index 8fa46dee2..e6d73f2d9 100644
--- a/definitions/grib3/template.4.0.def
+++ b/definitions/grib3/template.4.0.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 4.0, Latitude/longitude regular grid on ellipsoidal planet
 
diff --git a/definitions/grib3/template.4.1.def b/definitions/grib3/template.4.1.def
index 477162a69..6710fd9b6 100644
--- a/definitions/grib3/template.4.1.def
+++ b/definitions/grib3/template.4.1.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 4.1, Rotated latitude/longitude regular grid on ellipsoidal planet 
 
diff --git a/definitions/grib3/template.4.2.def b/definitions/grib3/template.4.2.def
index 474ef1c38..ef7334d3b 100644
--- a/definitions/grib3/template.4.2.def
+++ b/definitions/grib3/template.4.2.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 4.2, Stretched latitude/longitude regular grid on ellipsoidal planet
 
diff --git a/definitions/grib3/template.4.3.def b/definitions/grib3/template.4.3.def
index 930996946..28b5bb90b 100644
--- a/definitions/grib3/template.4.3.def
+++ b/definitions/grib3/template.4.3.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 4.3, Stretched and rotated latitude/longitude regular grid on ellipsoidal planet
 
diff --git a/definitions/grib3/template.4.horizontal.def b/definitions/grib3/template.4.horizontal.def
index bc259c772..5b1b78233 100755
--- a/definitions/grib3/template.4.horizontal.def
+++ b/definitions/grib3/template.4.horizontal.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 #  Type of first fixed surface
 codetable[1] typeOfFirstFixedSurface ('4.5.table',masterDir,localDir) : dump,no_copy,edition_specific,string_type;
diff --git a/definitions/grib3/template.4.resolution_flags.def b/definitions/grib3/template.4.resolution_flags.def
index bdc55846f..759ad5d0e 100644
--- a/definitions/grib3/template.4.resolution_flags.def
+++ b/definitions/grib3/template.4.resolution_flags.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 #  Resolution and component flags
 flags[1] resolutionAndComponentFlags 'grib3/tables/[tablesVersion]/3.3.table' : edition_specific,no_copy;
diff --git a/definitions/grib3/template.4.scanning_mode.def b/definitions/grib3/template.4.scanning_mode.def
index fe117d991..4fcd2fabb 100644
--- a/definitions/grib3/template.4.scanning_mode.def
+++ b/definitions/grib3/template.4.scanning_mode.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 flags[1] scanningMode 'grib3/tables/[tablesVersion]/3.4.table' : edition_specific,no_copy ;
 
diff --git a/definitions/grib3/template.5.0.def b/definitions/grib3/template.5.0.def
index dd15efcb8..9dd751987 100644
--- a/definitions/grib3/template.5.0.def
+++ b/definitions/grib3/template.5.0.def
@@ -1,12 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 # TEMPLATE 5.0, Vertical level
 
 # Vertical level
diff --git a/definitions/grib3/template.5.1.def b/definitions/grib3/template.5.1.def
index b2f4041b7..d59892970 100644
--- a/definitions/grib3/template.5.1.def
+++ b/definitions/grib3/template.5.1.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 5.1, Vertical layer
 
diff --git a/definitions/grib3/template.6.0.def b/definitions/grib3/template.6.0.def
index f30084b0c..2e3aa4c9c 100644
--- a/definitions/grib3/template.6.0.def
+++ b/definitions/grib3/template.6.0.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 6.0, Forecast, analysis or observation
 
diff --git a/definitions/grib3/template.6.1.def b/definitions/grib3/template.6.1.def
index 5f9e77fa6..282d9fa04 100644
--- a/definitions/grib3/template.6.1.def
+++ b/definitions/grib3/template.6.1.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 6.1, Individual ensemble forecast or analysis
 
diff --git a/definitions/grib3/template.6.2.def b/definitions/grib3/template.6.2.def
index 6fd511fd8..6e410aa9f 100644
--- a/definitions/grib3/template.6.2.def
+++ b/definitions/grib3/template.6.2.def
@@ -1,12 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 # TEMPLATE 6.2, Statistical post-processing of all ensemble members
 
 # Process type and identifier
diff --git a/definitions/grib3/template.7.0.def b/definitions/grib3/template.7.0.def
index ab6c102d3..05fa9d5be 100644
--- a/definitions/grib3/template.7.0.def
+++ b/definitions/grib3/template.7.0.def
@@ -1,12 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 # TEMPLATE 7.0, Observable property by discipline, category and number
 
 # Observable property by discipline, category and number
diff --git a/definitions/grib3/template.7.1.def b/definitions/grib3/template.7.1.def
index e101423a6..cf3fed8f9 100644
--- a/definitions/grib3/template.7.1.def
+++ b/definitions/grib3/template.7.1.def
@@ -1,12 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 # TEMPLATE 7.1, Observable Property with units conversion
 
 # Observable property by discipline, category and number
diff --git a/definitions/grib3/template.7.2.def b/definitions/grib3/template.7.2.def
index 8ed124fbd..910c83b5c 100644
--- a/definitions/grib3/template.7.2.def
+++ b/definitions/grib3/template.7.2.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 7.2, Atmospheric chemical or physical constituents
 
diff --git a/definitions/grib3/template.7.3.def b/definitions/grib3/template.7.3.def
index c54707463..6c5e2b486 100644
--- a/definitions/grib3/template.7.3.def
+++ b/definitions/grib3/template.7.3.def
@@ -1,12 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 # TEMPLATE 7.3, Aerosol physical property
 
 # Observable property by discipline, category and number
diff --git a/definitions/grib3/template.7.4.def b/definitions/grib3/template.7.4.def
index 4bb1b1500..83786f303 100644
--- a/definitions/grib3/template.7.4.def
+++ b/definitions/grib3/template.7.4.def
@@ -1,12 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 #
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
-
 # TEMPLATE 7.4, Aerosol optical property
 
 # Observable property by discipline, category and number
diff --git a/definitions/grib3/template.8.0.def b/definitions/grib3/template.8.0.def
index 3a9a0fffd..47c9f298b 100644
--- a/definitions/grib3/template.8.0.def
+++ b/definitions/grib3/template.8.0.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 8.0, Simple packing
 
diff --git a/definitions/grib3/template.8.1.def b/definitions/grib3/template.8.1.def
index c05cebe03..629610c8e 100644
--- a/definitions/grib3/template.8.1.def
+++ b/definitions/grib3/template.8.1.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 8.1, IEEE floating point
 
diff --git a/definitions/grib3/template.9.0.def b/definitions/grib3/template.9.0.def
index 9c5dfd50d..f41b54222 100644
--- a/definitions/grib3/template.9.0.def
+++ b/definitions/grib3/template.9.0.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 9.0, Bitmap