diff --git a/src/class-elements/delete-error/cls-decl-field-delete-covered.template b/src/class-elements/delete-error/cls-decl-field-delete-covered.template
index 726532e0a2aeccda9e87b0be46ead78dcf42ebda..846cb0ca304e292c87b43330c731119a4fcf8257 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete-covered.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/err-field-delete-covered-
+path: language/statements/class/syntax/early-errors/delete/field-delete-covered-
 name: in field, covered
 info: |
   Static Semantics: Early Errors
@@ -21,8 +21,6 @@ info: |
     CoverParenthesizedExpressionAndArrowParameterList ultimately derives a
     phrase that, if used in place of UnaryExpression, would produce a
     Syntax Error according to these rules. This rule is recursively applied.
-
-flags: [onlyStrict]
 features: [class, class-fields-private, class-fields-public]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template b/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
index d51398d67e150f74724813ed221e66f09cad571a..3c68bf39a26886fbc622cc28d1799b2820ddb8b4 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/err-field-delete-twice-covered-
+path: language/statements/class/syntax/early-errors/delete/field-delete-twice-covered-
 name: in field, recursively covered
 info: |
   Static Semantics: Early Errors
@@ -21,8 +21,6 @@ info: |
     CoverParenthesizedExpressionAndArrowParameterList ultimately derives a
     phrase that, if used in place of UnaryExpression, would produce a
     Syntax Error according to these rules. This rule is recursively applied.
-
-flags: [onlyStrict]
 features: [class, class-fields-private, class-fields-public]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-decl-field-delete.template b/src/class-elements/delete-error/cls-decl-field-delete.template
index 6658271a761a0959845f11ebd4db4118534f8447..1d6a0188eb45f3cd1fe4a104409ca3eff77d5134 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/err-field-delete-
+path: language/statements/class/syntax/early-errors/delete/field-delete-
 name: in field
 info: |
   Static Semantics: Early Errors
@@ -15,8 +15,6 @@ info: |
     PrimaryExpression : IdentifierReference ,
     MemberExpression : MemberExpression.PrivateName , or
     CallExpression : CallExpression.PrivateName .
-
-flags: [onlyStrict]
 features: [class, class-fields-private, class-fields-public]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-decl-method-delete-covered.template b/src/class-elements/delete-error/cls-decl-method-delete-covered.template
index cff9fb78b149616691440e574c57b0fe85496953..cb9d3845ad2bf58340696d9a239fb6e75f31b5bf 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete-covered.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/err-method-delete-covered-
+path: language/statements/class/syntax/early-errors/delete/method-delete-covered-
 name: in method, covered
 info: |
   Static Semantics: Early Errors
@@ -21,8 +21,6 @@ info: |
     CoverParenthesizedExpressionAndArrowParameterList ultimately derives a
     phrase that, if used in place of UnaryExpression, would produce a
     Syntax Error according to these rules. This rule is recursively applied.
-
-flags: [onlyStrict]
 features: [class, class-fields-private]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template b/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
index 05167a244d93ada3c06f06d639c4c896bea94f31..cdce44e0742f92116818f7e0feb53c6275d0b5b1 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/err-method-delete-twice-covered-
+path: language/statements/class/syntax/early-errors/delete/method-delete-twice-covered-
 name: in method, recursively covered
 info: |
   Static Semantics: Early Errors
@@ -21,8 +21,6 @@ info: |
     CoverParenthesizedExpressionAndArrowParameterList ultimately derives a
     phrase that, if used in place of UnaryExpression, would produce a
     Syntax Error according to these rules. This rule is recursively applied.
-
-flags: [onlyStrict]
 features: [class, class-fields-private]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-decl-method-delete.template b/src/class-elements/delete-error/cls-decl-method-delete.template
index 8ee970beb5021c3e5baa75e3bf62755857057ca2..38ed396afa7620154043ef835046746e21803557 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/err-method-delete-
+path: language/statements/class/syntax/early-errors/delete/method-delete-
 name: in method
 info: |
   Static Semantics: Early Errors
@@ -15,8 +15,6 @@ info: |
     PrimaryExpression : IdentifierReference ,
     MemberExpression : MemberExpression.PrivateName , or
     CallExpression : CallExpression.PrivateName .
-
-flags: [onlyStrict]
 features: [class, class-fields-private]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-expr-field-delete-covered.template b/src/class-elements/delete-error/cls-expr-field-delete-covered.template
index 2f1ec316d630de3897aa26eb79fa4b0ba8c3cd82..b0b51d7204fefb6f83088ff5c967275957977574 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete-covered.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/err-field-delete-covered-
+path: language/expressions/class/syntax/early-errors/delete/field-delete-covered-
 name: in field, covered
 info: |
   Static Semantics: Early Errors
@@ -21,8 +21,6 @@ info: |
     CoverParenthesizedExpressionAndArrowParameterList ultimately derives a
     phrase that, if used in place of UnaryExpression, would produce a
     Syntax Error according to these rules. This rule is recursively applied.
-
-flags: [onlyStrict]
 features: [class, class-fields-private, class-fields-public]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template b/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
index 8f44539294f0833d232da25ba953b296b8aa189a..139edf01520ec831e9c92103f9fda3ba60769dd7 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/err-field-delete-twice-covered-
+path: language/expressions/class/syntax/early-errors/delete/field-delete-twice-covered-
 name: in field, recursively covered
 info: |
   Static Semantics: Early Errors
@@ -21,8 +21,6 @@ info: |
     CoverParenthesizedExpressionAndArrowParameterList ultimately derives a
     phrase that, if used in place of UnaryExpression, would produce a
     Syntax Error according to these rules. This rule is recursively applied.
-
-flags: [onlyStrict]
 features: [class, class-fields-private, class-fields-public]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-expr-field-delete.template b/src/class-elements/delete-error/cls-expr-field-delete.template
index f88ee894855a7039fafe4917949cd4cb01dfd585..ff5a8f79818664aed076a98bfed3aff2e5c2276d 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/err-field-delete-
+path: language/expressions/class/syntax/early-errors/delete/field-delete-
 name: in field
 info: |
   Static Semantics: Early Errors
@@ -15,8 +15,6 @@ info: |
     PrimaryExpression : IdentifierReference ,
     MemberExpression : MemberExpression.PrivateName , or
     CallExpression : CallExpression.PrivateName .
-
-flags: [onlyStrict]
 features: [class, class-fields-private, class-fields-public]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-expr-method-delete-covered.template b/src/class-elements/delete-error/cls-expr-method-delete-covered.template
index acd884bb857fe53bac397d140e662b1a99bdfcc8..b7682d9b8743a20ad44149971fbc4dbb832c1b10 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete-covered.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/err-method-delete-covered-
+path: language/expressions/class/syntax/early-errors/delete/method-delete-covered-
 name: in method, covered
 info: |
   Static Semantics: Early Errors
@@ -21,8 +21,6 @@ info: |
     CoverParenthesizedExpressionAndArrowParameterList ultimately derives a
     phrase that, if used in place of UnaryExpression, would produce a
     Syntax Error according to these rules. This rule is recursively applied.
-
-flags: [onlyStrict]
 features: [class, class-fields-private]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template b/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
index aa78e14173e96d2be3c33224c6fe0b7d91e5ac4e..b6a84940ee1311bc842f3ff8dc8a35b96ee35551 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/err-method-delete-twice-covered-
+path: language/expressions/class/syntax/early-errors/delete/method-delete-twice-covered-
 name: in method, recursively covered
 info: |
   Static Semantics: Early Errors
@@ -21,8 +21,6 @@ info: |
     CoverParenthesizedExpressionAndArrowParameterList ultimately derives a
     phrase that, if used in place of UnaryExpression, would produce a
     Syntax Error according to these rules. This rule is recursively applied.
-
-flags: [onlyStrict]
 features: [class, class-fields-private]
 negative:
   type: SyntaxError
diff --git a/src/class-elements/delete-error/cls-expr-method-delete.template b/src/class-elements/delete-error/cls-expr-method-delete.template
index cf2383a907025df428d7a46ced89cc0e97276b3e..476b7d67291f2e6791bbd292c499f0584f9938b5 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/err-method-delete-
+path: language/expressions/class/syntax/early-errors/delete/method-delete-
 name: in method
 info: |
   Static Semantics: Early Errors
@@ -15,8 +15,6 @@ info: |
     PrimaryExpression : IdentifierReference ,
     MemberExpression : MemberExpression.PrivateName , or
     CallExpression : CallExpression.PrivateName .
-
-flags: [onlyStrict]
 features: [class, class-fields-private]
 negative:
   type: SyntaxError