diff --git a/src/accessor-names/default/cls-decl-inst.template b/src/accessor-names/default/cls-decl-inst.template
index dd9c973015..43f57a7a32 100644
--- a/src/accessor-names/default/cls-decl-inst.template
+++ b/src/accessor-names/default/cls-decl-inst.template
@@ -4,7 +4,6 @@
 path: language/statements/class/accessor-name-inst/
 name: Class declaration, instance method
 esid: sec-runtime-semantics-classdefinitionevaluation
-es6id: 14.5.14
 info: |
   [...]
   21. For each ClassElement m in order from methods
diff --git a/src/accessor-names/default/cls-decl-static.template b/src/accessor-names/default/cls-decl-static.template
index 3f995ae464..523f56e467 100644
--- a/src/accessor-names/default/cls-decl-static.template
+++ b/src/accessor-names/default/cls-decl-static.template
@@ -4,7 +4,6 @@
 path: language/statements/class/accessor-name-static/
 name: Class declaration, static method
 esid: sec-runtime-semantics-classdefinitionevaluation
-es6id: 14.5.14
 info: |
   [...]
   21. For each ClassElement m in order from methods
diff --git a/src/accessor-names/default/cls-expr-inst.template b/src/accessor-names/default/cls-expr-inst.template
index 02f0654332..71c8775ad7 100644
--- a/src/accessor-names/default/cls-expr-inst.template
+++ b/src/accessor-names/default/cls-expr-inst.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/accessor-name-inst/
 name: Class expression, instance method
 esid: sec-runtime-semantics-classdefinitionevaluation
-es6id: 14.5.14
 info: |
   [...]
   21. For each ClassElement m in order from methods
diff --git a/src/accessor-names/default/cls-expr-static.template b/src/accessor-names/default/cls-expr-static.template
index bdbf9bc70d..5792c07eec 100644
--- a/src/accessor-names/default/cls-expr-static.template
+++ b/src/accessor-names/default/cls-expr-static.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/accessor-name-static/
 name: Class expression, static method
 esid: sec-runtime-semantics-classdefinitionevaluation
-es6id: 14.5.14
 info: |
   [...]
   21. For each ClassElement m in order from methods
diff --git a/src/accessor-names/default/obj.template b/src/accessor-names/default/obj.template
index 5ceac65cf2..fb8e518721 100644
--- a/src/accessor-names/default/obj.template
+++ b/src/accessor-names/default/obj.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/accessor-name-
 name: Object initializer
 esid: sec-object-initializer-runtime-semantics-evaluation
-es6id: 12.2.6.8
 info: |
   ObjectLiteral :
     { PropertyDefinitionList }
diff --git a/src/accessor-names/error/cls-decl-inst.template b/src/accessor-names/error/cls-decl-inst.template
index 98a717730c..b66f82babc 100644
--- a/src/accessor-names/error/cls-decl-inst.template
+++ b/src/accessor-names/error/cls-decl-inst.template
@@ -4,7 +4,6 @@
 path: language/statements/class/accessor-name-inst/
 name: Class declaration, instance method
 esid: sec-runtime-semantics-classdefinitionevaluation
-es6id: 14.5.14
 info: |
   [...]
   21. For each ClassElement m in order from methods
diff --git a/src/accessor-names/error/cls-decl-static.template b/src/accessor-names/error/cls-decl-static.template
index 08658e9375..dc91421f46 100644
--- a/src/accessor-names/error/cls-decl-static.template
+++ b/src/accessor-names/error/cls-decl-static.template
@@ -4,7 +4,6 @@
 path: language/statements/class/accessor-name-static/
 name: Class declaration, static method
 esid: sec-runtime-semantics-classdefinitionevaluation
-es6id: 14.5.14
 info: |
   [...]
   21. For each ClassElement m in order from methods
diff --git a/src/accessor-names/error/cls-expr-inst.template b/src/accessor-names/error/cls-expr-inst.template
index 705b41a844..51136382b6 100644
--- a/src/accessor-names/error/cls-expr-inst.template
+++ b/src/accessor-names/error/cls-expr-inst.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/accessor-name-inst/
 name: Class expression, instance method
 esid: sec-runtime-semantics-classdefinitionevaluation
-es6id: 14.5.14
 info: |
   [...]
   21. For each ClassElement m in order from methods
diff --git a/src/accessor-names/error/cls-expr-static.template b/src/accessor-names/error/cls-expr-static.template
index a3a259295c..ce6e4ed522 100644
--- a/src/accessor-names/error/cls-expr-static.template
+++ b/src/accessor-names/error/cls-expr-static.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/accessor-name-static/
 name: Class expression, static method
 esid: sec-runtime-semantics-classdefinitionevaluation
-es6id: 14.5.14
 info: |
   [...]
   21. For each ClassElement m in order from methods
diff --git a/src/accessor-names/error/obj.template b/src/accessor-names/error/obj.template
index d4e197cfc2..a31ffc8ee5 100644
--- a/src/accessor-names/error/obj.template
+++ b/src/accessor-names/error/obj.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/accessor-name-
 name: Object initializer
 esid: sec-object-initializer-runtime-semantics-evaluation
-es6id: 12.2.6.8
 info: |
   ObjectLiteral :
     { PropertyDefinitionList }
diff --git a/src/annex-b-fns/eval-func/direct-block.template b/src/annex-b-fns/eval-func/direct-block.template
index 5c9ff6368b..acf10a3632 100644
--- a/src/annex-b-fns/eval-func/direct-block.template
+++ b/src/annex-b-fns/eval-func/direct-block.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/func-block-decl-
 name: Block statement in eval code containing a function declaration
 esid: sec-web-compat-evaldeclarationinstantiation
-es6id: B.3.3.3
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/eval-func/direct-if-decl-else-decl-a.template b/src/annex-b-fns/eval-func/direct-if-decl-else-decl-a.template
index c782eeeba6..be3846ad27 100644
--- a/src/annex-b-fns/eval-func/direct-if-decl-else-decl-a.template
+++ b/src/annex-b-fns/eval-func/direct-if-decl-else-decl-a.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/func-if-decl-else-decl-a-
 name: IfStatement with a declaration in both statement positions in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-func/direct-if-decl-else-decl-b.template b/src/annex-b-fns/eval-func/direct-if-decl-else-decl-b.template
index a893fe19da..bb5267a590 100644
--- a/src/annex-b-fns/eval-func/direct-if-decl-else-decl-b.template
+++ b/src/annex-b-fns/eval-func/direct-if-decl-else-decl-b.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/func-if-decl-else-decl-b-
 name: IfStatement with a declaration in both statement positions in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-func/direct-if-decl-else-stmt.template b/src/annex-b-fns/eval-func/direct-if-decl-else-stmt.template
index f1c6611b47..e5f59da1d1 100644
--- a/src/annex-b-fns/eval-func/direct-if-decl-else-stmt.template
+++ b/src/annex-b-fns/eval-func/direct-if-decl-else-stmt.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/func-if-decl-else-stmt-
 name: IfStatement with a declaration in the first statement position in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-func/direct-if-decl-no-else.template b/src/annex-b-fns/eval-func/direct-if-decl-no-else.template
index 34afeff78c..aca1017db5 100644
--- a/src/annex-b-fns/eval-func/direct-if-decl-no-else.template
+++ b/src/annex-b-fns/eval-func/direct-if-decl-no-else.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/func-if-decl-no-else-
 name: IfStatement without an else clause in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-func/direct-if-stmt-else-decl.template b/src/annex-b-fns/eval-func/direct-if-stmt-else-decl.template
index ef99e5ff52..e967da6bd7 100644
--- a/src/annex-b-fns/eval-func/direct-if-stmt-else-decl.template
+++ b/src/annex-b-fns/eval-func/direct-if-stmt-else-decl.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/func-if-stmt-else-decl-
 name: IfStatement with a declaration in the second statement position in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-func/direct-switch-case.template b/src/annex-b-fns/eval-func/direct-switch-case.template
index f6f7eaca09..b774883f39 100644
--- a/src/annex-b-fns/eval-func/direct-switch-case.template
+++ b/src/annex-b-fns/eval-func/direct-switch-case.template
@@ -5,7 +5,6 @@ path: annexB/language/eval-code/direct/func-switch-case-
 name: >
     Function declaration in the `case` clause of a `switch` statement in eval code
 esid: sec-web-compat-evaldeclarationinstantiation
-es6id: B.3.3.3
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/eval-func/direct-switch-dflt.template b/src/annex-b-fns/eval-func/direct-switch-dflt.template
index 4f2d4a7a15..c781ed2105 100644
--- a/src/annex-b-fns/eval-func/direct-switch-dflt.template
+++ b/src/annex-b-fns/eval-func/direct-switch-dflt.template
@@ -5,7 +5,6 @@ path: annexB/language/eval-code/direct/func-switch-dflt-
 name: >
     Funtion declaration in the `default` clause of a `switch` statement in eval code in the global scope
 esid: sec-web-compat-evaldeclarationinstantiation
-es6id: B.3.3.3
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/eval-global/direct-block.template b/src/annex-b-fns/eval-global/direct-block.template
index f408acd5ea..8e45121cb4 100644
--- a/src/annex-b-fns/eval-global/direct-block.template
+++ b/src/annex-b-fns/eval-global/direct-block.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/global-block-decl-
 name: Block statement in eval code containing a function declaration
 esid: sec-web-compat-evaldeclarationinstantiation
-es6id: B.3.3.3
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/eval-global/direct-if-decl-else-decl-a.template b/src/annex-b-fns/eval-global/direct-if-decl-else-decl-a.template
index d77d869cdb..f00ce3a119 100644
--- a/src/annex-b-fns/eval-global/direct-if-decl-else-decl-a.template
+++ b/src/annex-b-fns/eval-global/direct-if-decl-else-decl-a.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/global-if-decl-else-decl-a-
 name: IfStatement with a declaration in both statement positions in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.3
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/direct-if-decl-else-decl-b.template b/src/annex-b-fns/eval-global/direct-if-decl-else-decl-b.template
index 108f66a752..6b787603a2 100644
--- a/src/annex-b-fns/eval-global/direct-if-decl-else-decl-b.template
+++ b/src/annex-b-fns/eval-global/direct-if-decl-else-decl-b.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/global-if-decl-else-decl-b-
 name: IfStatement with a declaration in both statement positions in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/direct-if-decl-else-stmt.template b/src/annex-b-fns/eval-global/direct-if-decl-else-stmt.template
index 95c03d4b1e..78664837ef 100644
--- a/src/annex-b-fns/eval-global/direct-if-decl-else-stmt.template
+++ b/src/annex-b-fns/eval-global/direct-if-decl-else-stmt.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/global-if-decl-else-stmt-
 name: IfStatement with a declaration in the first statement position in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/direct-if-decl-no-else.template b/src/annex-b-fns/eval-global/direct-if-decl-no-else.template
index 33f4ff6248..ea090e1ec1 100644
--- a/src/annex-b-fns/eval-global/direct-if-decl-no-else.template
+++ b/src/annex-b-fns/eval-global/direct-if-decl-no-else.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/global-if-decl-no-else-
 name: IfStatement without an else clause in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/direct-if-stmt-else-decl.template b/src/annex-b-fns/eval-global/direct-if-stmt-else-decl.template
index 718f4c3b98..f3aac67afa 100644
--- a/src/annex-b-fns/eval-global/direct-if-stmt-else-decl.template
+++ b/src/annex-b-fns/eval-global/direct-if-stmt-else-decl.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/direct/global-if-stmt-else-decl-
 name: IfStatement with a declaration in the second statement position in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/direct-switch-case.template b/src/annex-b-fns/eval-global/direct-switch-case.template
index 7734e7c469..6072aab096 100644
--- a/src/annex-b-fns/eval-global/direct-switch-case.template
+++ b/src/annex-b-fns/eval-global/direct-switch-case.template
@@ -5,7 +5,6 @@ path: annexB/language/eval-code/direct/global-switch-case-
 name: >
     Function declaration in the `case` clause of a `switch` statement in eval code
 esid: sec-web-compat-evaldeclarationinstantiation
-es6id: B.3.3.3
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/eval-global/direct-switch-dflt.template b/src/annex-b-fns/eval-global/direct-switch-dflt.template
index 6dddaac910..f8c6f497f9 100644
--- a/src/annex-b-fns/eval-global/direct-switch-dflt.template
+++ b/src/annex-b-fns/eval-global/direct-switch-dflt.template
@@ -5,7 +5,6 @@ path: annexB/language/eval-code/direct/global-switch-dflt-
 name: >
     Funtion declaration in the `default` clause of a `switch` statement in eval code in the global scope
 esid: sec-web-compat-evaldeclarationinstantiation
-es6id: B.3.3.3
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/eval-global/indirect-block.template b/src/annex-b-fns/eval-global/indirect-block.template
index cbbcc3632c..ea81a0c755 100644
--- a/src/annex-b-fns/eval-global/indirect-block.template
+++ b/src/annex-b-fns/eval-global/indirect-block.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/indirect/global-block-decl-
 name: Block statement in eval code containing a function declaration
 esid: sec-web-compat-evaldeclarationinstantiation
-es6id: B.3.3.3
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/eval-global/indirect-if-decl-else-decl-a.template b/src/annex-b-fns/eval-global/indirect-if-decl-else-decl-a.template
index e550cbaa85..067ffde491 100644
--- a/src/annex-b-fns/eval-global/indirect-if-decl-else-decl-a.template
+++ b/src/annex-b-fns/eval-global/indirect-if-decl-else-decl-a.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/indirect/global-if-decl-else-decl-a-
 name: IfStatement with a declaration in both statement positions in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.3
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/indirect-if-decl-else-decl-b.template b/src/annex-b-fns/eval-global/indirect-if-decl-else-decl-b.template
index 762fad889f..1c39c8060b 100644
--- a/src/annex-b-fns/eval-global/indirect-if-decl-else-decl-b.template
+++ b/src/annex-b-fns/eval-global/indirect-if-decl-else-decl-b.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/indirect/global-if-decl-else-decl-b-
 name: IfStatement with a declaration in both statement positions in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/indirect-if-decl-else-stmt.template b/src/annex-b-fns/eval-global/indirect-if-decl-else-stmt.template
index 0ef368ff26..2bec3c013b 100644
--- a/src/annex-b-fns/eval-global/indirect-if-decl-else-stmt.template
+++ b/src/annex-b-fns/eval-global/indirect-if-decl-else-stmt.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/indirect/global-if-decl-else-stmt-
 name: IfStatement with a declaration in the first statement position in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/indirect-if-decl-no-else.template b/src/annex-b-fns/eval-global/indirect-if-decl-no-else.template
index 0c45eeecae..685aa38297 100644
--- a/src/annex-b-fns/eval-global/indirect-if-decl-no-else.template
+++ b/src/annex-b-fns/eval-global/indirect-if-decl-no-else.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/indirect/global-if-decl-no-else-
 name: IfStatement without an else clause in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/indirect-if-stmt-else-decl.template b/src/annex-b-fns/eval-global/indirect-if-stmt-else-decl.template
index 757fc08248..0999e5ee2f 100644
--- a/src/annex-b-fns/eval-global/indirect-if-stmt-else-decl.template
+++ b/src/annex-b-fns/eval-global/indirect-if-stmt-else-decl.template
@@ -4,7 +4,6 @@
 path: annexB/language/eval-code/indirect/global-if-stmt-else-decl-
 name: IfStatement with a declaration in the second statement position in eval code
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/eval-global/indirect-switch-case.template b/src/annex-b-fns/eval-global/indirect-switch-case.template
index 11fa9730ae..a70384cb41 100644
--- a/src/annex-b-fns/eval-global/indirect-switch-case.template
+++ b/src/annex-b-fns/eval-global/indirect-switch-case.template
@@ -5,7 +5,6 @@ path: annexB/language/eval-code/indirect/global-switch-case-
 name: >
     Function declaration in the `case` clause of a `switch` statement in eval code
 esid: sec-web-compat-evaldeclarationinstantiation
-es6id: B.3.3.3
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/eval-global/indirect-switch-dflt.template b/src/annex-b-fns/eval-global/indirect-switch-dflt.template
index 32fd4fd9ec..566759533f 100644
--- a/src/annex-b-fns/eval-global/indirect-switch-dflt.template
+++ b/src/annex-b-fns/eval-global/indirect-switch-dflt.template
@@ -5,7 +5,6 @@ path: annexB/language/eval-code/indirect/global-switch-dflt-
 name: >
     Funtion declaration in the `default` clause of a `switch` statement in eval code in the global scope
 esid: sec-web-compat-evaldeclarationinstantiation
-es6id: B.3.3.3
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/func/block.template b/src/annex-b-fns/func/block.template
index 740716c9ee..043dd6e8f1 100644
--- a/src/annex-b-fns/func/block.template
+++ b/src/annex-b-fns/func/block.template
@@ -4,7 +4,6 @@
 path: annexB/language/function-code/block-decl-
 name: Block statement in function scope containing a function declaration
 esid: sec-web-compat-functiondeclarationinstantiation
-es6id: B.3.3.1
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/func/if-decl-else-decl-a.template b/src/annex-b-fns/func/if-decl-else-decl-a.template
index f3246db9fe..2c58798929 100644
--- a/src/annex-b-fns/func/if-decl-else-decl-a.template
+++ b/src/annex-b-fns/func/if-decl-else-decl-a.template
@@ -4,7 +4,6 @@
 path: annexB/language/function-code/if-decl-else-decl-a-
 name: IfStatement with a declaration in both statement positions in function scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/func/if-decl-else-decl-b.template b/src/annex-b-fns/func/if-decl-else-decl-b.template
index 04025779d1..0c0e163582 100644
--- a/src/annex-b-fns/func/if-decl-else-decl-b.template
+++ b/src/annex-b-fns/func/if-decl-else-decl-b.template
@@ -4,7 +4,6 @@
 path: annexB/language/function-code/if-decl-else-decl-b-
 name: IfStatement with a declaration in both statement positions in function scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/func/if-decl-else-stmt.template b/src/annex-b-fns/func/if-decl-else-stmt.template
index a8b6bae00a..fd73bdce72 100644
--- a/src/annex-b-fns/func/if-decl-else-stmt.template
+++ b/src/annex-b-fns/func/if-decl-else-stmt.template
@@ -4,7 +4,6 @@
 path: annexB/language/function-code/if-decl-else-stmt-
 name: IfStatement with a declaration in the first statement position in function scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/func/if-decl-no-else.template b/src/annex-b-fns/func/if-decl-no-else.template
index bf5f1726b4..3118ae8bc8 100644
--- a/src/annex-b-fns/func/if-decl-no-else.template
+++ b/src/annex-b-fns/func/if-decl-no-else.template
@@ -4,7 +4,6 @@
 path: annexB/language/function-code/if-decl-no-else-
 name: IfStatement without an else clause in function scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/func/if-stmt-else-decl.template b/src/annex-b-fns/func/if-stmt-else-decl.template
index 829a64d732..93f4ca2f0d 100644
--- a/src/annex-b-fns/func/if-stmt-else-decl.template
+++ b/src/annex-b-fns/func/if-stmt-else-decl.template
@@ -4,7 +4,6 @@
 path: annexB/language/function-code/if-stmt-else-decl-
 name: IfStatement with a declaration in the second statement position in function scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/func/switch-case.template b/src/annex-b-fns/func/switch-case.template
index 1da8f56b3f..6aeb03f3bc 100644
--- a/src/annex-b-fns/func/switch-case.template
+++ b/src/annex-b-fns/func/switch-case.template
@@ -5,7 +5,6 @@ path: annexB/language/function-code/switch-case-
 name: >
     Function declaration in the `case` clause of a `switch` statement in function scope
 esid: sec-web-compat-functiondeclarationinstantiation
-es6id: B.3.3.1
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/func/switch-dflt.template b/src/annex-b-fns/func/switch-dflt.template
index 087e2f694e..0859e52ba2 100644
--- a/src/annex-b-fns/func/switch-dflt.template
+++ b/src/annex-b-fns/func/switch-dflt.template
@@ -5,7 +5,6 @@ path: annexB/language/function-code/switch-dflt-
 name: >
     Funtion declaration in the `default` clause of a `switch` statement in function scope
 esid: sec-web-compat-functiondeclarationinstantiation
-es6id: B.3.3.1
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/global/block.template b/src/annex-b-fns/global/block.template
index 4dd5bb92cc..ffe9e7bf77 100644
--- a/src/annex-b-fns/global/block.template
+++ b/src/annex-b-fns/global/block.template
@@ -4,7 +4,6 @@
 path: annexB/language/global-code/block-decl-
 name: Block statement in the global scope containing a function declaration
 esid: sec-web-compat-globaldeclarationinstantiation
-es6id: B.3.3.2
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/global/if-decl-else-decl-a.template b/src/annex-b-fns/global/if-decl-else-decl-a.template
index bba0b046e9..ad49608b14 100644
--- a/src/annex-b-fns/global/if-decl-else-decl-a.template
+++ b/src/annex-b-fns/global/if-decl-else-decl-a.template
@@ -4,7 +4,6 @@
 path: annexB/language/global-code/if-decl-else-decl-a-
 name: IfStatement with a declaration in both statement positions in the global scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/global/if-decl-else-decl-b.template b/src/annex-b-fns/global/if-decl-else-decl-b.template
index 5a06faaa53..2b9ee0534c 100644
--- a/src/annex-b-fns/global/if-decl-else-decl-b.template
+++ b/src/annex-b-fns/global/if-decl-else-decl-b.template
@@ -4,7 +4,6 @@
 path: annexB/language/global-code/if-decl-else-decl-b-
 name: IfStatement with a declaration in both statement positions in the global scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/global/if-decl-else-stmt.template b/src/annex-b-fns/global/if-decl-else-stmt.template
index 20ea33c49b..daccfb6e68 100644
--- a/src/annex-b-fns/global/if-decl-else-stmt.template
+++ b/src/annex-b-fns/global/if-decl-else-stmt.template
@@ -4,7 +4,6 @@
 path: annexB/language/global-code/if-decl-else-stmt-
 name: IfStatement with a declaration in the first statement position in the global scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/global/if-decl-no-else.template b/src/annex-b-fns/global/if-decl-no-else.template
index 75647592f0..28303f23a9 100644
--- a/src/annex-b-fns/global/if-decl-no-else.template
+++ b/src/annex-b-fns/global/if-decl-no-else.template
@@ -4,7 +4,6 @@
 path: annexB/language/global-code/if-decl-no-else-
 name: IfStatement without an else clause in the global scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/global/if-stmt-else-decl.template b/src/annex-b-fns/global/if-stmt-else-decl.template
index f558d46b00..c7d5e12419 100644
--- a/src/annex-b-fns/global/if-stmt-else-decl.template
+++ b/src/annex-b-fns/global/if-stmt-else-decl.template
@@ -4,7 +4,6 @@
 path: annexB/language/global-code/if-stmt-else-decl-
 name: IfStatement with a declaration in the second statement position in the global scope
 esid: sec-functiondeclarations-in-ifstatement-statement-clauses
-es6id: B.3.4
 info: |
     The following rules for IfStatement augment those in 13.6:
 
diff --git a/src/annex-b-fns/global/switch-case.template b/src/annex-b-fns/global/switch-case.template
index 7aa8426210..0f6982ef85 100644
--- a/src/annex-b-fns/global/switch-case.template
+++ b/src/annex-b-fns/global/switch-case.template
@@ -5,7 +5,6 @@ path: annexB/language/global-code/switch-case-
 name: >
     Function declaration in the `case` clause of a `switch` statement in the global scope
 esid: sec-web-compat-globaldeclarationinstantiation
-es6id: B.3.3.2
 flags: [noStrict]
 ---*/
 
diff --git a/src/annex-b-fns/global/switch-dflt.template b/src/annex-b-fns/global/switch-dflt.template
index 9cb1a0bd04..840112fb49 100644
--- a/src/annex-b-fns/global/switch-dflt.template
+++ b/src/annex-b-fns/global/switch-dflt.template
@@ -5,7 +5,6 @@ path: annexB/language/global-code/switch-dflt-
 name: >
     Funtion declaration in the `default` clause of a `switch` statement in the global scope
 esid: sec-web-compat-globaldeclarationinstantiation
-es6id: B.3.3.2
 flags: [noStrict]
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-iter-get-err.case b/src/dstr-assignment-for-await/array-elem-iter-get-err.case
index 06ebf52f86..dacb27775f 100644
--- a/src/dstr-assignment-for-await/array-elem-iter-get-err.case
+++ b/src/dstr-assignment-for-await/array-elem-iter-get-err.case
@@ -9,7 +9,6 @@ info: |
 
 features: [Symbol.iterator]
 template: async-generator
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-iter-nrml-close-err.case b/src/dstr-assignment-for-await/array-elem-iter-nrml-close-err.case
index 3ca0ccc29d..2cc9cb7487 100644
--- a/src/dstr-assignment-for-await/array-elem-iter-nrml-close-err.case
+++ b/src/dstr-assignment-for-await/array-elem-iter-nrml-close-err.case
@@ -10,7 +10,6 @@ info: |
 
 features: [Symbol.iterator]
 template: async-generator
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-iter-nrml-close-null.case b/src/dstr-assignment-for-await/array-elem-iter-nrml-close-null.case
index d03a318ae0..0849f1e2d4 100644
--- a/src/dstr-assignment-for-await/array-elem-iter-nrml-close-null.case
+++ b/src/dstr-assignment-for-await/array-elem-iter-nrml-close-null.case
@@ -20,7 +20,6 @@ info: |
 
 features: [Symbol.iterator]
 template: async-generator
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-iter-rtrn-close-null.case b/src/dstr-assignment-for-await/array-elem-iter-rtrn-close-null.case
index 10d18a136f..29e2cc9d30 100644
--- a/src/dstr-assignment-for-await/array-elem-iter-rtrn-close-null.case
+++ b/src/dstr-assignment-for-await/array-elem-iter-rtrn-close-null.case
@@ -20,7 +20,6 @@ info: |
 
 features: [Symbol.iterator, generators]
 template: async-generator
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-iter-thrw-close-skip.case b/src/dstr-assignment-for-await/array-elem-iter-thrw-close-skip.case
index 71d03881c4..80e26f70eb 100644
--- a/src/dstr-assignment-for-await/array-elem-iter-thrw-close-skip.case
+++ b/src/dstr-assignment-for-await/array-elem-iter-thrw-close-skip.case
@@ -11,7 +11,6 @@ info: |
     5. Return result.
 features: [Symbol.iterator]
 template: async-generator
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-trlg-iter-elision-iter-nrml-close-err.case b/src/dstr-assignment-for-await/array-elem-trlg-iter-elision-iter-nrml-close-err.case
index 96dd11cabe..5c9d190eb2 100644
--- a/src/dstr-assignment-for-await/array-elem-trlg-iter-elision-iter-nrml-close-err.case
+++ b/src/dstr-assignment-for-await/array-elem-trlg-iter-elision-iter-nrml-close-err.case
@@ -17,7 +17,6 @@ info: |
        status).
 features: [Symbol.iterator]
 template: async-generator
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-trlg-iter-elision-iter-nrml-close-null.case b/src/dstr-assignment-for-await/array-elem-trlg-iter-elision-iter-nrml-close-null.case
index 5d7e81a805..fedd1e40fe 100644
--- a/src/dstr-assignment-for-await/array-elem-trlg-iter-elision-iter-nrml-close-null.case
+++ b/src/dstr-assignment-for-await/array-elem-trlg-iter-elision-iter-nrml-close-null.case
@@ -27,7 +27,6 @@ info: |
        exception.
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-trlg-iter-list-nrml-close-err.case b/src/dstr-assignment-for-await/array-elem-trlg-iter-list-nrml-close-err.case
index fe44dc0900..02ead7e899 100644
--- a/src/dstr-assignment-for-await/array-elem-trlg-iter-list-nrml-close-err.case
+++ b/src/dstr-assignment-for-await/array-elem-trlg-iter-list-nrml-close-err.case
@@ -17,7 +17,6 @@ info: |
 
 features: [Symbol.iterator]
 template: async-generator
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-trlg-iter-list-thrw-close-skip.case b/src/dstr-assignment-for-await/array-elem-trlg-iter-list-thrw-close-skip.case
index c01dd08a5a..56e3753eb1 100644
--- a/src/dstr-assignment-for-await/array-elem-trlg-iter-list-thrw-close-skip.case
+++ b/src/dstr-assignment-for-await/array-elem-trlg-iter-list-thrw-close-skip.case
@@ -19,7 +19,6 @@ info: |
        b. Return Completion(status).
 features: [Symbol.iterator]
 template: async-generator
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment-for-await/array-elem-trlg-iter-rest-nrml-close-skip.case b/src/dstr-assignment-for-await/array-elem-trlg-iter-rest-nrml-close-skip.case
index 9ffd6a557d..1bba16aadc 100644
--- a/src/dstr-assignment-for-await/array-elem-trlg-iter-rest-nrml-close-skip.case
+++ b/src/dstr-assignment-for-await/array-elem-trlg-iter-rest-nrml-close-skip.case
@@ -18,7 +18,6 @@ info: |
 
 features: [Symbol.iterator]
 template: async-generator
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-get-err.case b/src/dstr-assignment/array-elem-iter-get-err.case
index ed4a51ffa1..fa26d4222b 100644
--- a/src/dstr-assignment/array-elem-iter-get-err.case
+++ b/src/dstr-assignment/array-elem-iter-get-err.case
@@ -9,7 +9,6 @@ info: |
     2. ReturnIfAbrupt(iterator).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-nrml-close-err.case b/src/dstr-assignment/array-elem-iter-nrml-close-err.case
index 197b79a77d..5714a71174 100644
--- a/src/dstr-assignment/array-elem-iter-nrml-close-err.case
+++ b/src/dstr-assignment/array-elem-iter-nrml-close-err.case
@@ -9,7 +9,6 @@ info: |
     5. If iteratorRecord.[[done]] is false, return IteratorClose(iterator, result).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-nrml-close-null.case b/src/dstr-assignment/array-elem-iter-nrml-close-null.case
index 37314b7c17..d51709864e 100644
--- a/src/dstr-assignment/array-elem-iter-nrml-close-null.case
+++ b/src/dstr-assignment/array-elem-iter-nrml-close-null.case
@@ -21,7 +21,6 @@ info: |
        exception.
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-nrml-close-skip.case b/src/dstr-assignment/array-elem-iter-nrml-close-skip.case
index 5ae2913345..74c8a0ceb9 100644
--- a/src/dstr-assignment/array-elem-iter-nrml-close-skip.case
+++ b/src/dstr-assignment/array-elem-iter-nrml-close-skip.case
@@ -12,7 +12,6 @@ info: |
     6. Return result.
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-nrml-close.case b/src/dstr-assignment/array-elem-iter-nrml-close.case
index f66f0ccda0..e3e109f41c 100644
--- a/src/dstr-assignment/array-elem-iter-nrml-close.case
+++ b/src/dstr-assignment/array-elem-iter-nrml-close.case
@@ -19,7 +19,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-rtrn-close-err.case b/src/dstr-assignment/array-elem-iter-rtrn-close-err.case
index 3742cf1509..e786f05296 100644
--- a/src/dstr-assignment/array-elem-iter-rtrn-close-err.case
+++ b/src/dstr-assignment/array-elem-iter-rtrn-close-err.case
@@ -20,7 +20,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-rtrn-close-null.case b/src/dstr-assignment/array-elem-iter-rtrn-close-null.case
index c524b37069..6b43d030af 100644
--- a/src/dstr-assignment/array-elem-iter-rtrn-close-null.case
+++ b/src/dstr-assignment/array-elem-iter-rtrn-close-null.case
@@ -21,7 +21,6 @@ info: |
        exception.
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-rtrn-close.case b/src/dstr-assignment/array-elem-iter-rtrn-close.case
index 1726266e25..2f7a59483d 100644
--- a/src/dstr-assignment/array-elem-iter-rtrn-close.case
+++ b/src/dstr-assignment/array-elem-iter-rtrn-close.case
@@ -20,7 +20,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-thrw-close-err.case b/src/dstr-assignment/array-elem-iter-thrw-close-err.case
index 04c4da8cc1..469a7c9565 100644
--- a/src/dstr-assignment/array-elem-iter-thrw-close-err.case
+++ b/src/dstr-assignment/array-elem-iter-thrw-close-err.case
@@ -13,7 +13,6 @@ info: |
     6. Return result.
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-thrw-close-skip.case b/src/dstr-assignment/array-elem-iter-thrw-close-skip.case
index 7ac68788d2..b1c609d11d 100644
--- a/src/dstr-assignment/array-elem-iter-thrw-close-skip.case
+++ b/src/dstr-assignment/array-elem-iter-thrw-close-skip.case
@@ -12,7 +12,6 @@ info: |
     6. Return result.
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-iter-thrw-close.case b/src/dstr-assignment/array-elem-iter-thrw-close.case
index 17129f09db..73a67e7100 100644
--- a/src/dstr-assignment/array-elem-iter-thrw-close.case
+++ b/src/dstr-assignment/array-elem-iter-thrw-close.case
@@ -19,7 +19,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-abpt.case b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-abpt.case
index 9994695515..d6f203cae0 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-abpt.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-abpt.case
@@ -17,7 +17,6 @@ info: |
           ii. Return Completion(status).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-err.case b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-err.case
index 554f0662f8..87a1354178 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-err.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-err.case
@@ -17,7 +17,6 @@ info: |
        status).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-null.case b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-null.case
index 8b67b0f7b7..23e202e530 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-null.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-null.case
@@ -27,7 +27,6 @@ info: |
        exception.
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-skip.case b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-skip.case
index 537491d49a..39d636c211 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-skip.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close-skip.case
@@ -18,7 +18,6 @@ info: |
     9. Return Completion(status).
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close.case b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close.case
index 9c99e7d2b2..764f177bfc 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-elision-iter-nrml-close.case
@@ -23,7 +23,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-get-err.case b/src/dstr-assignment/array-elem-trlg-iter-get-err.case
index b47c3ae4bc..f21409e1af 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-get-err.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-get-err.case
@@ -10,7 +10,6 @@ info: |
     2. ReturnIfAbrupt(iterator).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-err.case b/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-err.case
index c432ef0334..97bc053eec 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-err.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-err.case
@@ -17,7 +17,6 @@ info: |
        b. Return Completion(status).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-null.case b/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-null.case
index 2f2bf8995b..ed1a2aad46 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-null.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-null.case
@@ -27,7 +27,6 @@ info: |
        exception.
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-skip.case b/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-skip.case
index 6ecaf2ebc1..d038fe24f6 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-skip.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close-skip.case
@@ -19,7 +19,6 @@ info: |
        b. Return Completion(status).
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close.case b/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close.case
index 519f63baa0..5b33862b18 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-nrml-close.case
@@ -25,7 +25,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close-err.case b/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close-err.case
index 1c47fafd51..cf660ac4fa 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close-err.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close-err.case
@@ -25,7 +25,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close-null.case b/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close-null.case
index 73ac193520..220730d119 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close-null.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close-null.case
@@ -27,7 +27,6 @@ info: |
        exception.
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close.case b/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close.case
index 5e1ab2f448..71bf36ef9c 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-rtrn-close.case
@@ -26,7 +26,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close-err.case b/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close-err.case
index 683b386b9d..3e20a20b0a 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close-err.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close-err.case
@@ -24,7 +24,6 @@ info: |
 
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close-skip.case b/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close-skip.case
index 28d98902f7..9f2a0e83e9 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close-skip.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close-skip.case
@@ -19,7 +19,6 @@ info: |
        b. Return Completion(status).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close.case b/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close.case
index b55284f19c..af04120006 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-list-thrw-close.case
@@ -25,7 +25,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-rest-nrml-close-skip.case b/src/dstr-assignment/array-elem-trlg-iter-rest-nrml-close-skip.case
index 5499774223..2e8be9fb66 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-rest-nrml-close-skip.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-rest-nrml-close-skip.case
@@ -18,7 +18,6 @@ info: |
     9. Return Completion(status).
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close-err.case b/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close-err.case
index e2635d742d..04e7b99ee0 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close-err.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close-err.case
@@ -25,7 +25,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close-null.case b/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close-null.case
index d241f14801..eb438678f1 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close-null.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close-null.case
@@ -24,7 +24,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close.case b/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close.case
index c573c53fae..2757ec1dae 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-rest-rtrn-close.case
@@ -25,7 +25,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close-err.case b/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close-err.case
index 79ae32edb1..1714ab58b0 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close-err.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close-err.case
@@ -23,7 +23,6 @@ info: |
     7. If completion.[[type]] is throw, return Completion(completion)
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close-skip.case b/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close-skip.case
index 5d53e48717..925a2ebe6b 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close-skip.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close-skip.case
@@ -16,7 +16,6 @@ info: |
     9. Return Completion(status).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close.case b/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close.case
index 1908579446..0ed86f02ce 100644
--- a/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close.case
+++ b/src/dstr-assignment/array-elem-trlg-iter-rest-thrw-close.case
@@ -24,7 +24,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elision-iter-abpt.case b/src/dstr-assignment/array-elision-iter-abpt.case
index 3ae10f4790..fc889bc375 100644
--- a/src/dstr-assignment/array-elision-iter-abpt.case
+++ b/src/dstr-assignment/array-elision-iter-abpt.case
@@ -13,7 +13,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elision-iter-get-err.case b/src/dstr-assignment/array-elision-iter-get-err.case
index d623ab6907..507bca681e 100644
--- a/src/dstr-assignment/array-elision-iter-get-err.case
+++ b/src/dstr-assignment/array-elision-iter-get-err.case
@@ -9,7 +9,6 @@ info: |
     2. ReturnIfAbrupt(iterator).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elision-iter-nrml-close-err.case b/src/dstr-assignment/array-elision-iter-nrml-close-err.case
index e6ea53ee72..5e5f50ac82 100644
--- a/src/dstr-assignment/array-elision-iter-nrml-close-err.case
+++ b/src/dstr-assignment/array-elision-iter-nrml-close-err.case
@@ -13,7 +13,6 @@ info: |
     6. Return result.
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elision-iter-nrml-close-null.case b/src/dstr-assignment/array-elision-iter-nrml-close-null.case
index e91c29fcf5..7a664aaa08 100644
--- a/src/dstr-assignment/array-elision-iter-nrml-close-null.case
+++ b/src/dstr-assignment/array-elision-iter-nrml-close-null.case
@@ -22,7 +22,6 @@ info: |
        exception.
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elision-iter-nrml-close-skip.case b/src/dstr-assignment/array-elision-iter-nrml-close-skip.case
index 17d7c97baf..9e7a155d34 100644
--- a/src/dstr-assignment/array-elision-iter-nrml-close-skip.case
+++ b/src/dstr-assignment/array-elision-iter-nrml-close-skip.case
@@ -13,7 +13,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-elision-iter-nrml-close.case b/src/dstr-assignment/array-elision-iter-nrml-close.case
index 71c75a2d56..3328e9395a 100644
--- a/src/dstr-assignment/array-elision-iter-nrml-close.case
+++ b/src/dstr-assignment/array-elision-iter-nrml-close.case
@@ -20,7 +20,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-empty-iter-close-err.case b/src/dstr-assignment/array-empty-iter-close-err.case
index 8d33d030d1..62a5aa9c28 100644
--- a/src/dstr-assignment/array-empty-iter-close-err.case
+++ b/src/dstr-assignment/array-empty-iter-close-err.case
@@ -10,7 +10,6 @@ info: |
     3. Return IteratorClose(iterator, NormalCompletion(empty)).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-empty-iter-close-null.case b/src/dstr-assignment/array-empty-iter-close-null.case
index 42cef194a3..aa3c231a70 100644
--- a/src/dstr-assignment/array-empty-iter-close-null.case
+++ b/src/dstr-assignment/array-empty-iter-close-null.case
@@ -20,7 +20,6 @@ info: |
        exception.
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-empty-iter-close.case b/src/dstr-assignment/array-empty-iter-close.case
index abd0f57908..8c9317fd62 100644
--- a/src/dstr-assignment/array-empty-iter-close.case
+++ b/src/dstr-assignment/array-empty-iter-close.case
@@ -16,7 +16,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-empty-iter-get-err.case b/src/dstr-assignment/array-empty-iter-get-err.case
index 2a66e18b82..d736f9c929 100644
--- a/src/dstr-assignment/array-empty-iter-get-err.case
+++ b/src/dstr-assignment/array-empty-iter-get-err.case
@@ -9,7 +9,6 @@ info: |
     2. ReturnIfAbrupt(iterator).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-elision-iter-abpt.case b/src/dstr-assignment/array-rest-elision-iter-abpt.case
index a84bab56fd..70f512fca6 100644
--- a/src/dstr-assignment/array-rest-elision-iter-abpt.case
+++ b/src/dstr-assignment/array-rest-elision-iter-abpt.case
@@ -18,7 +18,6 @@ info: |
           ii. Return Completion(status).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-iter-get-err.case b/src/dstr-assignment/array-rest-iter-get-err.case
index 7693c779db..91033d90cb 100644
--- a/src/dstr-assignment/array-rest-iter-get-err.case
+++ b/src/dstr-assignment/array-rest-iter-get-err.case
@@ -9,7 +9,6 @@ info: |
     2. ReturnIfAbrupt(iterator).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-iter-nrml-close-skip.case b/src/dstr-assignment/array-rest-iter-nrml-close-skip.case
index 627731aa60..8c88a75d38 100644
--- a/src/dstr-assignment/array-rest-iter-nrml-close-skip.case
+++ b/src/dstr-assignment/array-rest-iter-nrml-close-skip.case
@@ -16,7 +16,6 @@ info: |
     7. Return result.
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-iter-rtrn-close-err.case b/src/dstr-assignment/array-rest-iter-rtrn-close-err.case
index aaeb47a8dd..bd85de0264 100644
--- a/src/dstr-assignment/array-rest-iter-rtrn-close-err.case
+++ b/src/dstr-assignment/array-rest-iter-rtrn-close-err.case
@@ -29,7 +29,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-iter-rtrn-close-null.case b/src/dstr-assignment/array-rest-iter-rtrn-close-null.case
index f911aea3f8..fd75418a8d 100644
--- a/src/dstr-assignment/array-rest-iter-rtrn-close-null.case
+++ b/src/dstr-assignment/array-rest-iter-rtrn-close-null.case
@@ -34,7 +34,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-iter-rtrn-close.case b/src/dstr-assignment/array-rest-iter-rtrn-close.case
index 35366c2aa2..3fb5b46ff4 100644
--- a/src/dstr-assignment/array-rest-iter-rtrn-close.case
+++ b/src/dstr-assignment/array-rest-iter-rtrn-close.case
@@ -35,7 +35,6 @@ info: |
     8. If innerResult.[[type]] is throw, return Completion(innerResult).
 features: [Symbol.iterator, generators]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-iter-thrw-close-err.case b/src/dstr-assignment/array-rest-iter-thrw-close-err.case
index 4c98fb20f5..f2233998a9 100644
--- a/src/dstr-assignment/array-rest-iter-thrw-close-err.case
+++ b/src/dstr-assignment/array-rest-iter-thrw-close-err.case
@@ -22,7 +22,6 @@ info: |
        b. ReturnIfAbrupt(lref).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-iter-thrw-close-skip.case b/src/dstr-assignment/array-rest-iter-thrw-close-skip.case
index d95493775c..c97f3d3e54 100644
--- a/src/dstr-assignment/array-rest-iter-thrw-close-skip.case
+++ b/src/dstr-assignment/array-rest-iter-thrw-close-skip.case
@@ -13,7 +13,6 @@ info: |
        result).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-iter-thrw-close.case b/src/dstr-assignment/array-rest-iter-thrw-close.case
index 3028c1afe0..8236043d85 100644
--- a/src/dstr-assignment/array-rest-iter-thrw-close.case
+++ b/src/dstr-assignment/array-rest-iter-thrw-close.case
@@ -28,7 +28,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-lref-err.case b/src/dstr-assignment/array-rest-lref-err.case
index 56f4712052..f0e577ca41 100644
--- a/src/dstr-assignment/array-rest-lref-err.case
+++ b/src/dstr-assignment/array-rest-lref-err.case
@@ -22,7 +22,6 @@ info: |
        b. ReturnIfAbrupt(lref).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-lref.case b/src/dstr-assignment/array-rest-lref.case
index b16315041c..8d7d3d6ec2 100644
--- a/src/dstr-assignment/array-rest-lref.case
+++ b/src/dstr-assignment/array-rest-lref.case
@@ -21,7 +21,6 @@ info: |
     [...]
 features: [Symbol.iterator]
 template: default
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-nested-array-iter-thrw-close-skip.case b/src/dstr-assignment/array-rest-nested-array-iter-thrw-close-skip.case
index c569539803..fe349976d2 100644
--- a/src/dstr-assignment/array-rest-nested-array-iter-thrw-close-skip.case
+++ b/src/dstr-assignment/array-rest-nested-array-iter-thrw-close-skip.case
@@ -25,7 +25,6 @@ info: |
        nestedAssignmentPattern with A as the argument.
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/array-rest-put-prop-ref-user-err-iter-close-skip.case b/src/dstr-assignment/array-rest-put-prop-ref-user-err-iter-close-skip.case
index b82be99fe1..33103e7ba0 100644
--- a/src/dstr-assignment/array-rest-put-prop-ref-user-err-iter-close-skip.case
+++ b/src/dstr-assignment/array-rest-put-prop-ref-user-err-iter-close-skip.case
@@ -26,7 +26,6 @@ info: |
        a. Return PutValue(lref, A).
 features: [Symbol.iterator]
 template: error
-es6id: 12.14.5.2
 esid: sec-runtime-semantics-destructuringassignmentevaluation
 ---*/
 
diff --git a/src/dstr-assignment/default/assignment-expr.template b/src/dstr-assignment/default/assignment-expr.template
index fe28f87b2a..bd23da4300 100644
--- a/src/dstr-assignment/default/assignment-expr.template
+++ b/src/dstr-assignment/default/assignment-expr.template
@@ -5,7 +5,6 @@ path: language/expressions/assignment/dstr/
 name: >
     AssignmentExpression
 esid: sec-variable-statement-runtime-semantics-evaluation
-es6id: 13.3.2.4
 features: [destructuring-binding]
 info: |
     VariableDeclaration : BindingPattern Initializer
diff --git a/src/dstr-assignment/default/for-of.template b/src/dstr-assignment/default/for-of.template
index 0572e41603..2f01bc1502 100644
--- a/src/dstr-assignment/default/for-of.template
+++ b/src/dstr-assignment/default/for-of.template
@@ -5,7 +5,6 @@ path: language/statements/for-of/dstr/
 name: >
     For..of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
   IterationStatement :
diff --git a/src/dstr-assignment/error/assignment-expr.template b/src/dstr-assignment/error/assignment-expr.template
index ef3abc0ac9..10daab9a6c 100644
--- a/src/dstr-assignment/error/assignment-expr.template
+++ b/src/dstr-assignment/error/assignment-expr.template
@@ -5,7 +5,6 @@ path: language/expressions/assignment/dstr/
 name: >
     AssignmentExpression
 esid: sec-variable-statement-runtime-semantics-evaluation
-es6id: 13.3.2.4
 features: [destructuring-binding]
 info: |
     VariableDeclaration : BindingPattern Initializer
diff --git a/src/dstr-assignment/error/for-of.template b/src/dstr-assignment/error/for-of.template
index 9588488c08..ec4fc31423 100644
--- a/src/dstr-assignment/error/for-of.template
+++ b/src/dstr-assignment/error/for-of.template
@@ -5,7 +5,6 @@ path: language/statements/for-of/dstr/
 name: >
     For..of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
   IterationStatement :
diff --git a/src/dstr-assignment/syntax/assignment-expr.template b/src/dstr-assignment/syntax/assignment-expr.template
index f634ff6852..9b98c23fbf 100644
--- a/src/dstr-assignment/syntax/assignment-expr.template
+++ b/src/dstr-assignment/syntax/assignment-expr.template
@@ -5,7 +5,6 @@ path: language/expressions/assignment/dstr/
 name: >
     AssignmentExpression
 esid: sec-variable-statement-runtime-semantics-evaluation
-es6id: 13.3.2.4
 features: [destructuring-binding]
 info: |
     VariableDeclaration : BindingPattern Initializer
diff --git a/src/dstr-assignment/syntax/for-in.template b/src/dstr-assignment/syntax/for-in.template
index d4ad97bcaf..a9b60b5682 100644
--- a/src/dstr-assignment/syntax/for-in.template
+++ b/src/dstr-assignment/syntax/for-in.template
@@ -5,7 +5,6 @@ path: language/statements/for-in/dstr/
 name: >
     For..in statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
   IterationStatement :
diff --git a/src/dstr-assignment/syntax/for-of.template b/src/dstr-assignment/syntax/for-of.template
index 1a89eddaf6..7a1b4b431d 100644
--- a/src/dstr-assignment/syntax/for-of.template
+++ b/src/dstr-assignment/syntax/for-of.template
@@ -5,7 +5,6 @@ path: language/statements/for-of/dstr/
 name: >
     For..of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
   IterationStatement :
diff --git a/src/dstr-binding/default/arrow-function-dflt.template b/src/dstr-binding/default/arrow-function-dflt.template
index c38fe9a0e7..5a05a0e295 100644
--- a/src/dstr-binding/default/arrow-function-dflt.template
+++ b/src/dstr-binding/default/arrow-function-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/arrow-function/dstr/dflt-
 name: arrow function expression (default parameter)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
-es6id: 14.2.16
 features: [destructuring-binding, default-parameters]
 info: |
     ArrowFunction : ArrowParameters => ConciseBody
diff --git a/src/dstr-binding/default/arrow-function.template b/src/dstr-binding/default/arrow-function.template
index e9365deef6..9335bf9142 100644
--- a/src/dstr-binding/default/arrow-function.template
+++ b/src/dstr-binding/default/arrow-function.template
@@ -4,7 +4,6 @@
 path: language/expressions/arrow-function/dstr/
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
-es6id: 14.2.16
 features: [destructuring-binding]
 info: |
     ArrowFunction : ArrowParameters => ConciseBody
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
index 5ccfc2e578..b9071e0636 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/gen-meth-dflt-
 name: class expression method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
index 655c47ba39..573c744988 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-static.template b/src/dstr-binding/default/cls-decl-gen-meth-static.template
index 570b70bbd0..3c2582c79c 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-static.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [generators, destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-gen-meth.template b/src/dstr-binding/default/cls-decl-gen-meth.template
index 41f7fbc639..bc8f12291a 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-meth-dflt.template b/src/dstr-binding/default/cls-decl-meth-dflt.template
index 6a3139a96e..698a6a1a7d 100644
--- a/src/dstr-binding/default/cls-decl-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-meth-static-dflt.template
index f19012837d..61354f6f24 100644
--- a/src/dstr-binding/default/cls-decl-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-meth-static-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-meth-static.template b/src/dstr-binding/default/cls-decl-meth-static.template
index 3814c1aee1..3e13c02a24 100644
--- a/src/dstr-binding/default/cls-decl-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-meth-static.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-meth.template b/src/dstr-binding/default/cls-decl-meth.template
index ee4384f25d..4f895363cc 100644
--- a/src/dstr-binding/default/cls-decl-meth.template
+++ b/src/dstr-binding/default/cls-decl-meth.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
index 037fb1da27..0019aa4820 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
index 09071348a3..f7ad14ff7e 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-static.template b/src/dstr-binding/default/cls-expr-gen-meth-static.template
index 9992266834..d9c4178e98 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-static.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-gen-meth.template b/src/dstr-binding/default/cls-expr-gen-meth.template
index 06faa0450b..bfda5914db 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-meth-dflt.template b/src/dstr-binding/default/cls-expr-meth-dflt.template
index 94636d4603..e98bdfa537 100644
--- a/src/dstr-binding/default/cls-expr-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-meth-static-dflt.template
index 55b947ee9b..2d41fe1f39 100644
--- a/src/dstr-binding/default/cls-expr-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-meth-static-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-meth-static.template b/src/dstr-binding/default/cls-expr-meth-static.template
index 7413426a03..e58e11c801 100644
--- a/src/dstr-binding/default/cls-expr-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-meth-static.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-meth.template b/src/dstr-binding/default/cls-expr-meth.template
index 355cb82fd6..7f27c2a159 100644
--- a/src/dstr-binding/default/cls-expr-meth.template
+++ b/src/dstr-binding/default/cls-expr-meth.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/const-stmt.template b/src/dstr-binding/default/const-stmt.template
index 0ee88b6cf5..a1a3882145 100644
--- a/src/dstr-binding/default/const-stmt.template
+++ b/src/dstr-binding/default/const-stmt.template
@@ -5,7 +5,6 @@ path: language/statements/const/dstr/
 name: >
     `const` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
-es6id: 13.3.1.4
 features: [destructuring-binding]
 info: |
     LexicalBinding : BindingPattern Initializer
diff --git a/src/dstr-binding/default/for-const.template b/src/dstr-binding/default/for-const.template
index 32c1ae7561..71181fab2a 100644
--- a/src/dstr-binding/default/for-const.template
+++ b/src/dstr-binding/default/for-const.template
@@ -4,7 +4,6 @@
 path: language/statements/for/dstr/const-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
-es6id: 13.7.4.7
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/default/for-let.template b/src/dstr-binding/default/for-let.template
index 87260f26b6..6bdb9134dd 100644
--- a/src/dstr-binding/default/for-let.template
+++ b/src/dstr-binding/default/for-let.template
@@ -4,7 +4,6 @@
 path: language/statements/for/dstr/let-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
-es6id: 13.7.4.7
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/default/for-of-const.template b/src/dstr-binding/default/for-of-const.template
index 103f4435c8..4dcf046aa1 100644
--- a/src/dstr-binding/default/for-of-const.template
+++ b/src/dstr-binding/default/for-of-const.template
@@ -4,7 +4,6 @@
 path: language/statements/for-of/dstr/const-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/default/for-of-let.template b/src/dstr-binding/default/for-of-let.template
index 65137c6f74..33fcd09bb3 100644
--- a/src/dstr-binding/default/for-of-let.template
+++ b/src/dstr-binding/default/for-of-let.template
@@ -4,7 +4,6 @@
 path: language/statements/for-of/dstr/let-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/default/for-of-var.template b/src/dstr-binding/default/for-of-var.template
index 09929fd013..6cf402cb2e 100644
--- a/src/dstr-binding/default/for-of-var.template
+++ b/src/dstr-binding/default/for-of-var.template
@@ -4,7 +4,6 @@
 path: language/statements/for-of/dstr/var-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/default/for-var.template b/src/dstr-binding/default/for-var.template
index 66dbf194ca..8eef2cee76 100644
--- a/src/dstr-binding/default/for-var.template
+++ b/src/dstr-binding/default/for-var.template
@@ -4,7 +4,6 @@
 path: language/statements/for/dstr/var-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
-es6id: 13.7.4.7
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/default/func-decl-dflt.template b/src/dstr-binding/default/func-decl-dflt.template
index 9543ca1c08..2202a9f8c9 100644
--- a/src/dstr-binding/default/func-decl-dflt.template
+++ b/src/dstr-binding/default/func-decl-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/function/dstr/dflt-
 name: function declaration (default parameter)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
-es6id: 14.1.19
 features: [destructuring-binding, default-parameters]
 info: |
     FunctionDeclaration :
diff --git a/src/dstr-binding/default/func-decl.template b/src/dstr-binding/default/func-decl.template
index f45aad790c..643d409966 100644
--- a/src/dstr-binding/default/func-decl.template
+++ b/src/dstr-binding/default/func-decl.template
@@ -4,7 +4,6 @@
 path: language/statements/function/dstr/
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
-es6id: 14.1.19
 features: [destructuring-binding]
 info: |
     FunctionDeclaration :
diff --git a/src/dstr-binding/default/func-expr-dflt.template b/src/dstr-binding/default/func-expr-dflt.template
index 2f2a9237ba..8e5132ad75 100644
--- a/src/dstr-binding/default/func-expr-dflt.template
+++ b/src/dstr-binding/default/func-expr-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/function/dstr/dflt-
 name: function expression (default parameter)
 esid: sec-function-definitions-runtime-semantics-evaluation
-es6id: 14.1.20
 features: [destructuring-binding, default-parameters]
 info: |
     FunctionExpression : function ( FormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/default/func-expr.template b/src/dstr-binding/default/func-expr.template
index b29195dc5a..d2f0719bde 100644
--- a/src/dstr-binding/default/func-expr.template
+++ b/src/dstr-binding/default/func-expr.template
@@ -4,7 +4,6 @@
 path: language/expressions/function/dstr/
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
-es6id: 14.1.20
 features: [destructuring-binding]
 info: |
     FunctionExpression : function ( FormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/default/gen-func-decl-dflt.template b/src/dstr-binding/default/gen-func-decl-dflt.template
index 34a3f0d8b9..ef9006832c 100644
--- a/src/dstr-binding/default/gen-func-decl-dflt.template
+++ b/src/dstr-binding/default/gen-func-decl-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/generators/dstr/dflt-
 name: generator function declaration (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
-es6id: 14.4.12
 features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/default/gen-func-decl.template b/src/dstr-binding/default/gen-func-decl.template
index 23d1b876c9..6f1e672a00 100644
--- a/src/dstr-binding/default/gen-func-decl.template
+++ b/src/dstr-binding/default/gen-func-decl.template
@@ -4,7 +4,6 @@
 path: language/statements/generators/dstr/
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
-es6id: 14.4.12
 features: [generators, destructuring-binding]
 info: |
     GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/default/gen-func-expr-dflt.template b/src/dstr-binding/default/gen-func-expr-dflt.template
index 5e2d0b926d..b4355e8e26 100644
--- a/src/dstr-binding/default/gen-func-expr-dflt.template
+++ b/src/dstr-binding/default/gen-func-expr-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/generators/dstr/dflt-
 name: generator function expression (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
-es6id: 14.4.14
 features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/default/gen-func-expr.template b/src/dstr-binding/default/gen-func-expr.template
index 74d2caadaf..3e8c7e0efa 100644
--- a/src/dstr-binding/default/gen-func-expr.template
+++ b/src/dstr-binding/default/gen-func-expr.template
@@ -4,7 +4,6 @@
 path: language/expressions/generators/dstr/
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
-es6id: 14.4.14
 features: [generators, destructuring-binding]
 info: |
     GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/default/gen-meth.template b/src/dstr-binding/default/gen-meth.template
index 0c4fc28aad..674028be11 100644
--- a/src/dstr-binding/default/gen-meth.template
+++ b/src/dstr-binding/default/gen-meth.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/dstr/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
-es6id: 14.4.13
 features: [generators, destructuring-binding]
 info: |
     GeneratorMethod :
diff --git a/src/dstr-binding/default/gen-method-dflt.template b/src/dstr-binding/default/gen-method-dflt.template
index d51f4cc552..befba05882 100644
--- a/src/dstr-binding/default/gen-method-dflt.template
+++ b/src/dstr-binding/default/gen-method-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/dstr/gen-meth-dflt-
 name: generator method (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
-es6id: 14.4.13
 features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorMethod :
diff --git a/src/dstr-binding/default/let-stmt.template b/src/dstr-binding/default/let-stmt.template
index 3569d17c2e..ca13b2464a 100644
--- a/src/dstr-binding/default/let-stmt.template
+++ b/src/dstr-binding/default/let-stmt.template
@@ -5,7 +5,6 @@ path: language/statements/let/dstr/
 name: >
     `let` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
-es6id: 13.3.1.4
 features: [destructuring-binding]
 info: |
     LexicalBinding : BindingPattern Initializer
diff --git a/src/dstr-binding/default/meth-dflt.template b/src/dstr-binding/default/meth-dflt.template
index bc77ee0e1b..900244e19e 100644
--- a/src/dstr-binding/default/meth-dflt.template
+++ b/src/dstr-binding/default/meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/dstr/meth-dflt-
 name: method (default parameter)
 esid: sec-runtime-semantics-definemethod
-es6id: 14.3.8
 features: [destructuring-binding, default-parameters]
 info: |
     MethodDefinition : PropertyName ( StrictFormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/default/meth.template b/src/dstr-binding/default/meth.template
index 77376c53a5..2f1b7346ac 100644
--- a/src/dstr-binding/default/meth.template
+++ b/src/dstr-binding/default/meth.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/dstr/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
-es6id: 14.3.8
 features: [destructuring-binding]
 info: |
     MethodDefinition : PropertyName ( StrictFormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/default/try.template b/src/dstr-binding/default/try.template
index fb1881b68e..0c5bf86390 100644
--- a/src/dstr-binding/default/try.template
+++ b/src/dstr-binding/default/try.template
@@ -4,7 +4,6 @@
 path: language/statements/try/dstr/
 name: try statement
 esid: sec-runtime-semantics-catchclauseevaluation
-es6id: 13.15.7
 features: [destructuring-binding]
 info: |
     Catch : catch ( CatchParameter ) Block
diff --git a/src/dstr-binding/default/var-stmt.template b/src/dstr-binding/default/var-stmt.template
index 5650469c3e..ba0899a9f7 100644
--- a/src/dstr-binding/default/var-stmt.template
+++ b/src/dstr-binding/default/var-stmt.template
@@ -5,7 +5,6 @@ path: language/statements/variable/dstr/
 name: >
     `var` statement
 esid: sec-variable-statement-runtime-semantics-evaluation
-es6id: 13.3.2.4
 features: [destructuring-binding]
 info: |
     VariableDeclaration : BindingPattern Initializer
diff --git a/src/dstr-binding/error/arrow-function-dflt.template b/src/dstr-binding/error/arrow-function-dflt.template
index 7cbabac815..526db9a04d 100644
--- a/src/dstr-binding/error/arrow-function-dflt.template
+++ b/src/dstr-binding/error/arrow-function-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/arrow-function/dstr/dflt-
 name: arrow function expression (default parameter)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
-es6id: 14.2.16
 features: [destructuring-binding, default-parameters]
 info: |
     ArrowFunction : ArrowParameters => ConciseBody
diff --git a/src/dstr-binding/error/arrow-function.template b/src/dstr-binding/error/arrow-function.template
index 407ad12300..b7bd4fbbfe 100644
--- a/src/dstr-binding/error/arrow-function.template
+++ b/src/dstr-binding/error/arrow-function.template
@@ -4,7 +4,6 @@
 path: language/expressions/arrow-function/dstr/
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
-es6id: 14.2.16
 features: [destructuring-binding]
 info: |
     ArrowFunction : ArrowParameters => ConciseBody
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-dflt.template b/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
index b35bedb50d..6b602aece0 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
index 88b8065b10..1111c42adb 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-static.template b/src/dstr-binding/error/cls-decl-gen-meth-static.template
index 7f3a2399f8..2ff986d515 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-static.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [generators, destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/error/cls-decl-gen-meth.template b/src/dstr-binding/error/cls-decl-gen-meth.template
index 2ebbcb7b91..5ac12db250 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/error/cls-decl-meth-dflt.template b/src/dstr-binding/error/cls-decl-meth-dflt.template
index 9175802c68..cbbc988db1 100644
--- a/src/dstr-binding/error/cls-decl-meth-dflt.template
+++ b/src/dstr-binding/error/cls-decl-meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/error/cls-decl-meth-static-dflt.template b/src/dstr-binding/error/cls-decl-meth-static-dflt.template
index 228ef40527..5dda252362 100644
--- a/src/dstr-binding/error/cls-decl-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-decl-meth-static-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/error/cls-decl-meth-static.template b/src/dstr-binding/error/cls-decl-meth-static.template
index 8cbf39a94c..b8a7755448 100644
--- a/src/dstr-binding/error/cls-decl-meth-static.template
+++ b/src/dstr-binding/error/cls-decl-meth-static.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/error/cls-decl-meth.template b/src/dstr-binding/error/cls-decl-meth.template
index 96ac5d49b9..e04d889605 100644
--- a/src/dstr-binding/error/cls-decl-meth.template
+++ b/src/dstr-binding/error/cls-decl-meth.template
@@ -4,7 +4,6 @@
 path: language/statements/class/dstr/meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
-es6id: 14.5.15
 features: [destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-dflt.template b/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
index 2b3a806fcc..dd1573713f 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
index a7046384a0..1a34b29eaa 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-static.template b/src/dstr-binding/error/cls-expr-gen-meth-static.template
index 74f572754d..a8dcb56889 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-static.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/error/cls-expr-gen-meth.template b/src/dstr-binding/error/cls-expr-gen-meth.template
index 47e8b370fa..8426856b4d 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [generators, destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/error/cls-expr-meth-dflt.template b/src/dstr-binding/error/cls-expr-meth-dflt.template
index d3ebdab173..b6c1132d74 100644
--- a/src/dstr-binding/error/cls-expr-meth-dflt.template
+++ b/src/dstr-binding/error/cls-expr-meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/error/cls-expr-meth-static-dflt.template b/src/dstr-binding/error/cls-expr-meth-static-dflt.template
index d5aa14738e..0dbd89e27a 100644
--- a/src/dstr-binding/error/cls-expr-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-expr-meth-static-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/error/cls-expr-meth-static.template b/src/dstr-binding/error/cls-expr-meth-static.template
index 296d65ff38..e597ff03ea 100644
--- a/src/dstr-binding/error/cls-expr-meth-static.template
+++ b/src/dstr-binding/error/cls-expr-meth-static.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/error/cls-expr-meth.template b/src/dstr-binding/error/cls-expr-meth.template
index 494cec232f..95e5ffcf73 100644
--- a/src/dstr-binding/error/cls-expr-meth.template
+++ b/src/dstr-binding/error/cls-expr-meth.template
@@ -4,7 +4,6 @@
 path: language/expressions/class/dstr/meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
-es6id: 14.5.16
 features: [destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/error/const-stmt.template b/src/dstr-binding/error/const-stmt.template
index 19fe7ede2c..ee8c5cb933 100644
--- a/src/dstr-binding/error/const-stmt.template
+++ b/src/dstr-binding/error/const-stmt.template
@@ -5,7 +5,6 @@ path: language/statements/const/dstr/
 name: >
     `const` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
-es6id: 13.3.1.4
 features: [destructuring-binding]
 info: |
     LexicalBinding : BindingPattern Initializer
diff --git a/src/dstr-binding/error/for-const.template b/src/dstr-binding/error/for-const.template
index 2990bc8850..ece282d326 100644
--- a/src/dstr-binding/error/for-const.template
+++ b/src/dstr-binding/error/for-const.template
@@ -4,7 +4,6 @@
 path: language/statements/for/dstr/const-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
-es6id: 13.7.4.7
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/error/for-let.template b/src/dstr-binding/error/for-let.template
index 237a248413..00bee3b43e 100644
--- a/src/dstr-binding/error/for-let.template
+++ b/src/dstr-binding/error/for-let.template
@@ -4,7 +4,6 @@
 path: language/statements/for/dstr/let-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
-es6id: 13.7.4.7
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/error/for-of-const.template b/src/dstr-binding/error/for-of-const.template
index 0bc9bbb64b..4c8f5e1b33 100644
--- a/src/dstr-binding/error/for-of-const.template
+++ b/src/dstr-binding/error/for-of-const.template
@@ -4,7 +4,6 @@
 path: language/statements/for-of/dstr/const-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/error/for-of-let.template b/src/dstr-binding/error/for-of-let.template
index 37109515bb..279d1c118c 100644
--- a/src/dstr-binding/error/for-of-let.template
+++ b/src/dstr-binding/error/for-of-let.template
@@ -4,7 +4,6 @@
 path: language/statements/for-of/dstr/let-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/error/for-of-var.template b/src/dstr-binding/error/for-of-var.template
index 7bc1bba89e..ebbbbe2600 100644
--- a/src/dstr-binding/error/for-of-var.template
+++ b/src/dstr-binding/error/for-of-var.template
@@ -4,7 +4,6 @@
 path: language/statements/for-of/dstr/var-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/error/for-var.template b/src/dstr-binding/error/for-var.template
index 9b7eec2ab1..bfac8e9cb0 100644
--- a/src/dstr-binding/error/for-var.template
+++ b/src/dstr-binding/error/for-var.template
@@ -4,7 +4,6 @@
 path: language/statements/for/dstr/var-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
-es6id: 13.7.4.7
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/error/func-decl-dflt.template b/src/dstr-binding/error/func-decl-dflt.template
index f0fada3da2..38da706b44 100644
--- a/src/dstr-binding/error/func-decl-dflt.template
+++ b/src/dstr-binding/error/func-decl-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/function/dstr/dflt-
 name: function declaration (default parameter)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
-es6id: 14.1.19
 features: [destructuring-binding, default-parameters]
 info: |
     FunctionDeclaration :
diff --git a/src/dstr-binding/error/func-decl.template b/src/dstr-binding/error/func-decl.template
index 103f714343..0c68d29aff 100644
--- a/src/dstr-binding/error/func-decl.template
+++ b/src/dstr-binding/error/func-decl.template
@@ -4,7 +4,6 @@
 path: language/statements/function/dstr/
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
-es6id: 14.1.19
 features: [destructuring-binding]
 info: |
     FunctionDeclaration :
diff --git a/src/dstr-binding/error/func-expr-dflt.template b/src/dstr-binding/error/func-expr-dflt.template
index 06546ee61b..b9f6ee3ec7 100644
--- a/src/dstr-binding/error/func-expr-dflt.template
+++ b/src/dstr-binding/error/func-expr-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/function/dstr/dflt-
 name: function expression (default parameter)
 esid: sec-function-definitions-runtime-semantics-evaluation
-es6id: 14.1.20
 features: [destructuring-binding, default-parameters]
 info: |
     FunctionExpression : function ( FormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/error/func-expr.template b/src/dstr-binding/error/func-expr.template
index aafedd0e6a..707a8b6cf9 100644
--- a/src/dstr-binding/error/func-expr.template
+++ b/src/dstr-binding/error/func-expr.template
@@ -4,7 +4,6 @@
 path: language/expressions/function/dstr/
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
-es6id: 14.1.20
 features: [destructuring-binding]
 info: |
     FunctionExpression : function ( FormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/error/gen-func-decl-dflt.template b/src/dstr-binding/error/gen-func-decl-dflt.template
index 24ad152a9a..f51dee193e 100644
--- a/src/dstr-binding/error/gen-func-decl-dflt.template
+++ b/src/dstr-binding/error/gen-func-decl-dflt.template
@@ -4,7 +4,6 @@
 path: language/statements/generators/dstr/dflt-
 name: generator function declaration (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
-es6id: 14.4.12
 features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/error/gen-func-decl.template b/src/dstr-binding/error/gen-func-decl.template
index b3058a7578..8e61d7dbda 100644
--- a/src/dstr-binding/error/gen-func-decl.template
+++ b/src/dstr-binding/error/gen-func-decl.template
@@ -4,7 +4,6 @@
 path: language/statements/generators/dstr/
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
-es6id: 14.4.12
 features: [generators, destructuring-binding]
 info: |
     GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/error/gen-func-expr-dflt.template b/src/dstr-binding/error/gen-func-expr-dflt.template
index 982b6e417f..542b505b59 100644
--- a/src/dstr-binding/error/gen-func-expr-dflt.template
+++ b/src/dstr-binding/error/gen-func-expr-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/generators/dstr/dflt-
 name: generator function expression (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
-es6id: 14.4.14
 features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/error/gen-func-expr.template b/src/dstr-binding/error/gen-func-expr.template
index de951c4a3e..49c146c188 100644
--- a/src/dstr-binding/error/gen-func-expr.template
+++ b/src/dstr-binding/error/gen-func-expr.template
@@ -4,7 +4,6 @@
 path: language/expressions/generators/dstr/
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
-es6id: 14.4.14
 features: [generators, destructuring-binding]
 info: |
     GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/error/gen-meth-dflt.template b/src/dstr-binding/error/gen-meth-dflt.template
index 178174ebb0..d00ff1030b 100644
--- a/src/dstr-binding/error/gen-meth-dflt.template
+++ b/src/dstr-binding/error/gen-meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/dstr/gen-meth-dflt-
 name: generator method (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
-es6id: 14.4.13
 features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorMethod :
diff --git a/src/dstr-binding/error/gen-meth.template b/src/dstr-binding/error/gen-meth.template
index 2e4c09aa4f..63baa0500c 100644
--- a/src/dstr-binding/error/gen-meth.template
+++ b/src/dstr-binding/error/gen-meth.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/dstr/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
-es6id: 14.4.13
 features: [generators, destructuring-binding]
 info: |
     GeneratorMethod :
diff --git a/src/dstr-binding/error/let-stmt.template b/src/dstr-binding/error/let-stmt.template
index dbef6eca07..28e4a3db7f 100644
--- a/src/dstr-binding/error/let-stmt.template
+++ b/src/dstr-binding/error/let-stmt.template
@@ -5,7 +5,6 @@ path: language/statements/let/dstr/
 name: >
     `let` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
-es6id: 13.3.1.4
 features: [destructuring-binding]
 info: |
     LexicalBinding : BindingPattern Initializer
diff --git a/src/dstr-binding/error/meth-dflt.template b/src/dstr-binding/error/meth-dflt.template
index b1faa121ec..02ae6ce556 100644
--- a/src/dstr-binding/error/meth-dflt.template
+++ b/src/dstr-binding/error/meth-dflt.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/dstr/meth-dflt-
 name: method (default parameter)
 esid: sec-runtime-semantics-definemethod
-es6id: 14.3.8
 features: [destructuring-binding, default-parameters]
 info: |
     MethodDefinition : PropertyName ( StrictFormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/error/meth.template b/src/dstr-binding/error/meth.template
index f0f26bbb63..332d73c97c 100644
--- a/src/dstr-binding/error/meth.template
+++ b/src/dstr-binding/error/meth.template
@@ -4,7 +4,6 @@
 path: language/expressions/object/dstr/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
-es6id: 14.3.8
 features: [destructuring-binding]
 info: |
     MethodDefinition : PropertyName ( StrictFormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/error/try.template b/src/dstr-binding/error/try.template
index 611365d567..4938d2a874 100644
--- a/src/dstr-binding/error/try.template
+++ b/src/dstr-binding/error/try.template
@@ -4,7 +4,6 @@
 path: language/statements/try/dstr/
 name: try statement
 esid: sec-runtime-semantics-catchclauseevaluation
-es6id: 13.15.7
 features: [destructuring-binding]
 info: |
     Catch : catch ( CatchParameter ) Block
diff --git a/src/dstr-binding/error/var-stmt.template b/src/dstr-binding/error/var-stmt.template
index 0a1b9b72a7..7f7cad89a7 100644
--- a/src/dstr-binding/error/var-stmt.template
+++ b/src/dstr-binding/error/var-stmt.template
@@ -5,7 +5,6 @@ path: language/statements/variable/dstr/
 name: >
     `var` statement
 esid: sec-variable-statement-runtime-semantics-evaluation
-es6id: 13.3.2.4
 features: [destructuring-binding]
 info: |
     VariableDeclaration : BindingPattern Initializer
diff --git a/src/dstr-binding/iter-close/for-const.template b/src/dstr-binding/iter-close/for-const.template
index 1ad33ac052..48d20ae887 100644
--- a/src/dstr-binding/iter-close/for-const.template
+++ b/src/dstr-binding/iter-close/for-const.template
@@ -4,7 +4,6 @@
 path: language/statements/for/dstr/const-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
-es6id: 13.7.4.7
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/iter-close/for-let.template b/src/dstr-binding/iter-close/for-let.template
index 185a814481..19e8480f59 100644
--- a/src/dstr-binding/iter-close/for-let.template
+++ b/src/dstr-binding/iter-close/for-let.template
@@ -4,7 +4,6 @@
 path: language/statements/for/dstr/let-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
-es6id: 13.7.4.7
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/iter-close/for-of-const.template b/src/dstr-binding/iter-close/for-of-const.template
index fd0ece582c..d2662be7aa 100644
--- a/src/dstr-binding/iter-close/for-of-const.template
+++ b/src/dstr-binding/iter-close/for-of-const.template
@@ -4,7 +4,6 @@
 path: language/statements/for-of/dstr/const-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/iter-close/for-of-let.template b/src/dstr-binding/iter-close/for-of-let.template
index 393b7ed548..9ec3951015 100644
--- a/src/dstr-binding/iter-close/for-of-let.template
+++ b/src/dstr-binding/iter-close/for-of-let.template
@@ -4,7 +4,6 @@
 path: language/statements/for-of/dstr/let-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/iter-close/for-of-var.template b/src/dstr-binding/iter-close/for-of-var.template
index 0cabbb93b4..5562b1bba5 100644
--- a/src/dstr-binding/iter-close/for-of-var.template
+++ b/src/dstr-binding/iter-close/for-of-var.template
@@ -4,7 +4,6 @@
 path: language/statements/for-of/dstr/var-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
-es6id: 13.7.5.11
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/dstr-binding/iter-close/for-var.template b/src/dstr-binding/iter-close/for-var.template
index 62fabb5d33..5dba9aa51e 100644
--- a/src/dstr-binding/iter-close/for-var.template
+++ b/src/dstr-binding/iter-close/for-var.template
@@ -4,7 +4,6 @@
 path: language/statements/for/dstr/var-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
-es6id: 13.7.4.7
 features: [destructuring-binding]
 info: |
     IterationStatement :
diff --git a/src/spread/default/array.template b/src/spread/default/array.template
index f5525ce4ed..4a2484ab45 100644
--- a/src/spread/default/array.template
+++ b/src/spread/default/array.template
@@ -4,7 +4,6 @@
 path: language/expressions/array/spread-
 name: Array initializer
 esid: sec-runtime-semantics-arrayaccumulation
-es6id: 12.2.5.2
 info: |
   SpreadElement : ...AssignmentExpression
 
diff --git a/src/spread/default/call-expr.template b/src/spread/default/call-expr.template
index 0a9b111a07..2f781f5b96 100644
--- a/src/spread/default/call-expr.template
+++ b/src/spread/default/call-expr.template
@@ -4,7 +4,6 @@
 path: language/expressions/call/spread-
 name: CallExpression
 esid: sec-function-calls-runtime-semantics-evaluation
-es6id: 12.3.4.1
 info: |
     CallExpression : MemberExpression Arguments
 
diff --git a/src/spread/default/member-expr.template b/src/spread/default/member-expr.template
index 7bab200971..253e19ca99 100644
--- a/src/spread/default/member-expr.template
+++ b/src/spread/default/member-expr.template
@@ -5,7 +5,6 @@ path: language/expressions/new/spread-
 name: >
     `new` operator
 esid: sec-new-operator-runtime-semantics-evaluation
-es6id: 12.3.3.1
 info: |
     MemberExpression : new MemberExpression Arguments
 
diff --git a/src/spread/default/super-call.template b/src/spread/default/super-call.template
index 87a11454fe..7212910f71 100644
--- a/src/spread/default/super-call.template
+++ b/src/spread/default/super-call.template
@@ -4,7 +4,6 @@
 path: language/expressions/super/call-spread-
 name: SuperCall
 esid: sec-super-keyword-runtime-semantics-evaluation
-es6id: 12.3.5.1
 info: |
     SuperCall : super Arguments
 
diff --git a/src/spread/error/array.template b/src/spread/error/array.template
index 3506aeaa05..1d7222a3ad 100644
--- a/src/spread/error/array.template
+++ b/src/spread/error/array.template
@@ -4,7 +4,6 @@
 path: language/expressions/array/spread-err-
 name: Array initializer
 esid: sec-runtime-semantics-arrayaccumulation
-es6id: 12.2.5.2
 info: |
   SpreadElement : ...AssignmentExpression
 
diff --git a/src/spread/error/call-expr.template b/src/spread/error/call-expr.template
index 3ea419bf26..43b7acba38 100644
--- a/src/spread/error/call-expr.template
+++ b/src/spread/error/call-expr.template
@@ -4,7 +4,6 @@
 path: language/expressions/call/spread-err-
 name: CallExpression
 esid: sec-function-calls-runtime-semantics-evaluation
-es6id: 12.3.4.1
 info: |
     CallExpression : MemberExpression Arguments
 
diff --git a/src/spread/error/member-expr.template b/src/spread/error/member-expr.template
index c9b330d504..026e1a8a96 100644
--- a/src/spread/error/member-expr.template
+++ b/src/spread/error/member-expr.template
@@ -5,7 +5,6 @@ path: language/expressions/new/spread-err-
 name: >
     `new` operator
 esid: sec-new-operator-runtime-semantics-evaluation
-es6id: 12.3.3.1
 info: |
     MemberExpression : new MemberExpression Arguments
 
diff --git a/src/spread/error/super-call.template b/src/spread/error/super-call.template
index 6b64eb6b3c..af5bbfb40b 100644
--- a/src/spread/error/super-call.template
+++ b/src/spread/error/super-call.template
@@ -4,7 +4,6 @@
 path: language/expressions/super/call-spread-err-
 name: SuperCall
 esid: sec-super-keyword-runtime-semantics-evaluation
-es6id: 12.3.5.1
 info: |
     SuperCall : super Arguments