diff --git a/src/class-elements/class-private-field-whitespace-syntax-error.case b/src/class-elements/class-private-field-whitespace-syntax-error.case
deleted file mode 100644
index 37d3702700352c046a0fa0fb72eeb7534695e06e..0000000000000000000000000000000000000000
--- a/src/class-elements/class-private-field-whitespace-syntax-error.case
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax/invalid
-features: [class-fields-private]
----*/
-
-//- fields
-# x = 1
diff --git a/src/class-elements/grammar-privatename-whitespace-error-accessor-get-meth.case b/src/class-elements/grammar-privatename-whitespace-error-accessor-get-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..23473a93bf1e706dea1fa870c8f58e962d352ff6
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-accessor-get-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName ()
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-methods-private]
+---*/
+
+//- elements
+get # m() {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-accessor-set-meth.case b/src/class-elements/grammar-privatename-whitespace-error-accessor-set-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..c27d6e4d3824216342473fed72b4a3210c0d16a0
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-accessor-set-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Accessor set Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-methods-private]
+---*/
+
+//- elements
+set # m(_) {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-async-gen-meth.case b/src/class-elements/grammar-privatename-whitespace-error-async-gen-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..7d380ff86195f60004f84c90173a9b452260ccae
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-async-gen-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Async Generator Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [async-iteration, class-methods-private]
+---*/
+
+//- elements
+async * # m() {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-async-meth.case b/src/class-elements/grammar-privatename-whitespace-error-async-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..949ad6fef278a1cab6771713bdcdc786152f9ba7
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-async-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Async Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [async-functions, class-methods-private]
+---*/
+
+//- elements
+async # m() {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-call-expr.case b/src/class-elements/grammar-privatename-whitespace-error-call-expr.case
new file mode 100644
index 0000000000000000000000000000000000000000..72d8dc7fd7c1f80487344f882f543dc06e694575
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-call-expr.case
@@ -0,0 +1,30 @@
+// Copyright (C) 2018 Leo Balter. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (CallExpression)
+info: |
+  Updated Productions
+
+  MemberExpression :
+    MemberExpression . PrivateName
+
+  CallExpression :
+    CallExpression . PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-fields-private]
+---*/
+
+//- elements
+#x;
+
+f() {
+  return this;
+}
+
+m() {
+  this.f().# x;
+}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-field-init.case b/src/class-elements/grammar-privatename-whitespace-error-field-init.case
new file mode 100644
index 0000000000000000000000000000000000000000..bd3023afe51c1b28a23a2187b4a08ef90f18e2b4
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-field-init.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Leo Balter. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Field with Initializer)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-fields-private]
+---*/
+
+//- elements
+# x = 1;
diff --git a/src/class-elements/grammar-privatename-whitespace-error-field.case b/src/class-elements/grammar-privatename-whitespace-error-field.case
new file mode 100644
index 0000000000000000000000000000000000000000..60fa47bc6bd66557e8ed6059fb3004364131f4dd
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-field.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Leo Balter. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Field)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-fields-private]
+---*/
+
+//- elements
+# x;
diff --git a/src/class-elements/grammar-privatename-whitespace-error-gen-meth.case b/src/class-elements/grammar-privatename-whitespace-error-gen-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..e918163a5ab28879998b2911725e7abe195f9c42
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-gen-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Generator Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [generators, class-methods-private]
+---*/
+
+//- elements
+* # m() {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-member-expr.case b/src/class-elements/grammar-privatename-whitespace-error-member-expr.case
new file mode 100644
index 0000000000000000000000000000000000000000..1688ff75dbde1189ef1a4eafc62e5de573b2368b
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-member-expr.case
@@ -0,0 +1,25 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (MemberExpression)
+info: |
+  Updated Productions
+
+  MemberExpression :
+    MemberExpression . PrivateName
+
+  CallExpression :
+    CallExpression . PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-fields-private]
+---*/
+
+//- elements
+#x;
+m() {
+  this.# x;
+}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-meth.case.case b/src/class-elements/grammar-privatename-whitespace-error-meth.case.case
new file mode 100644
index 0000000000000000000000000000000000000000..83d1cb6979bfea250564aa4ea74964317eebf426
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-meth.case.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-methods-private]
+---*/
+
+//- elements
+# m() {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-static-accessor-get-meth.case b/src/class-elements/grammar-privatename-whitespace-error-static-accessor-get-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..1a681a7fea0d43f443bd8b040d6859c052e3b3c7
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-static-accessor-get-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Static Accessor get Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-static-methods-private]
+---*/
+
+//- elements
+static get # m() {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-static-accessor-set-meth.case b/src/class-elements/grammar-privatename-whitespace-error-static-accessor-set-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..69f4fee00b77e5d05b00c0ced6022708c1ad0929
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-static-accessor-set-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Static Accessor set Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-static-methods-private]
+---*/
+
+//- elements
+static set # m(_) {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-static-async-gen-meth.case b/src/class-elements/grammar-privatename-whitespace-error-static-async-gen-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..22dcf3cf53592fbfceeebe29f045ed293c18b048
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-static-async-gen-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Static Async Generator Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [async-iteration, class-static-methods-private]
+---*/
+
+//- elements
+static async * # m() {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-static-async-meth.case b/src/class-elements/grammar-privatename-whitespace-error-static-async-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..fb0631565c0f7926f722b1ba14abc12f73fd9210
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-static-async-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Async Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-static-methods-private]
+---*/
+
+//- elements
+static async # m() {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-static-field-init.case b/src/class-elements/grammar-privatename-whitespace-error-static-field-init.case
new file mode 100644
index 0000000000000000000000000000000000000000..61b592afac6a4fb49b0265841ef2351d6e38fcef
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-static-field-init.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Leo Balter. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Static Field with Initializer)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-static-fields-private]
+---*/
+
+//- elements
+static # x = 1;
diff --git a/src/class-elements/grammar-privatename-whitespace-error-static-field.case b/src/class-elements/grammar-privatename-whitespace-error-static-field.case
new file mode 100644
index 0000000000000000000000000000000000000000..268439e46fe083035c3be0c6962ec9e64b9b7017
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-static-field.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Leo Balter. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Static Field)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-static-fields-private]
+---*/
+
+//- elements
+static # x;
diff --git a/src/class-elements/grammar-privatename-whitespace-error-static-gen-meth.case b/src/class-elements/grammar-privatename-whitespace-error-static-gen-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..c69b9affd480aea831854764728a6e6059afd4b0
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-static-gen-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Static Generator Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [generators, class-static-methods-private]
+---*/
+
+//- elements
+static * # m() {}
diff --git a/src/class-elements/grammar-privatename-whitespace-error-static-meth.case b/src/class-elements/grammar-privatename-whitespace-error-static-meth.case
new file mode 100644
index 0000000000000000000000000000000000000000..e51d5a44d89c43def2c29bf5e2105ed122263d21
--- /dev/null
+++ b/src/class-elements/grammar-privatename-whitespace-error-static-meth.case
@@ -0,0 +1,20 @@
+// Copyright (C) 2018 Bloomberg LP. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: No space allowed between sigil and IdentifierName (Static Method)
+info: |
+  Updated Productions
+
+  ClassElementName :
+    PropertyName
+    PrivateName
+
+  PrivateName ::
+    # IdentifierName
+template: syntax/invalid
+features: [class-static-methods-private]
+---*/
+
+//- elements
+static # m() {}
diff --git a/src/class-methods/class-private-async-generator-method-static-whitespace-syntax-error.case b/src/class-methods/class-private-async-generator-method-static-whitespace-syntax-error.case
deleted file mode 100644
index ea3e7374ed6c02d3ef7255d507f4881cd0bceb63..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-async-generator-method-static-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-static async * # m() {}
diff --git a/src/class-methods/class-private-async-generator-method-whitespace-syntax-error.case b/src/class-methods/class-private-async-generator-method-whitespace-syntax-error.case
deleted file mode 100644
index 8989cb811b79cc84d43f235281c85fe6982b865a..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-async-generator-method-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-async * # m() {}
diff --git a/src/class-methods/class-private-async-method-static-whitespace-syntax-error.case b/src/class-methods/class-private-async-method-static-whitespace-syntax-error.case
deleted file mode 100644
index 12106904ea553bacb229d8d72259fe9d6409505b..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-async-method-static-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-static async # m() {}
diff --git a/src/class-methods/class-private-async-method-whitespace-syntax-error.case b/src/class-methods/class-private-async-method-whitespace-syntax-error.case
deleted file mode 100644
index a7a2c25958d88b66871a7c55c8805dfd04f9a914..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-async-method-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-async # m() {}
diff --git a/src/class-methods/class-private-generator-method-static-whitespace-syntax-error.case b/src/class-methods/class-private-generator-method-static-whitespace-syntax-error.case
deleted file mode 100644
index 37069b4fee1cd93ae8de4868ced1a66809bf1c00..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-generator-method-static-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-static * # m() {}
diff --git a/src/class-methods/class-private-generator-method-whitespace-syntax-error.case b/src/class-methods/class-private-generator-method-whitespace-syntax-error.case
deleted file mode 100644
index 3a97227731223854d3021a47990e89ecc92a8ab4..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-generator-method-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-* # m() {}
diff --git a/src/class-methods/class-private-getter-static-whitespace-syntax-error.case b/src/class-methods/class-private-getter-static-whitespace-syntax-error.case
deleted file mode 100644
index 65525415b361ce41ef8dbb56f4ab509b59106257..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-getter-static-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-static set # m() {}
diff --git a/src/class-methods/class-private-getter-whitespace-syntax-error.case b/src/class-methods/class-private-getter-whitespace-syntax-error.case
deleted file mode 100644
index 2c067f13723c9f1f5c39a00a7c7817c4e9aad8d2..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-getter-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-get # m() {}
diff --git a/src/class-methods/class-private-method-static-whitespace-syntax-error.case b/src/class-methods/class-private-method-static-whitespace-syntax-error.case
deleted file mode 100644
index c29a56416b26a219b0f253a4836d15ea9bfed263..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-method-static-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-static # m() {}
diff --git a/src/class-methods/class-private-method-whitespace-syntax-error.case b/src/class-methods/class-private-method-whitespace-syntax-error.case
deleted file mode 100644
index cd0feaeb5f4f7496ce2d8bb52191dd2e3fc3c7c0..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-method-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-# m() {}
diff --git a/src/class-methods/class-private-method-whitespace-usage-syntax-error.case b/src/class-methods/class-private-method-whitespace-usage-syntax-error.case
deleted file mode 100644
index dd53217e3c77cdf5f84f92865af774d872695a01..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-method-whitespace-usage-syntax-error.case
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-m() {
-	this.# x = 1;
-}
diff --git a/src/class-methods/class-private-setter-static-whitespace-syntax-error.case b/src/class-methods/class-private-setter-static-whitespace-syntax-error.case
deleted file mode 100644
index 65525415b361ce41ef8dbb56f4ab509b59106257..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-setter-static-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-static set # m() {}
diff --git a/src/class-methods/class-private-setter-whitespace-syntax-error.case b/src/class-methods/class-private-setter-whitespace-syntax-error.case
deleted file mode 100644
index c9c7dca58b9df27258dd4e9a9540da8fb3c90df4..0000000000000000000000000000000000000000
--- a/src/class-methods/class-private-setter-whitespace-syntax-error.case
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
- /*---
-desc: Syntax error if whitespace after '#' sigil
-template: syntax
-features: [class-methods-private]
-negative:
-  phase: parse
-  type: SyntaxError
----*/
-//- setup
-throw "Test262: This statement should not be evaluated.";
-
- //- methods
-set # m() {}
diff --git a/src/class-methods/syntax/class-decl.template b/src/class-methods/syntax/class-decl.template
deleted file mode 100644
index e7f31724371b1f0ec49de4e1c6f38087ed90fed9..0000000000000000000000000000000000000000
--- a/src/class-methods/syntax/class-decl.template
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: prod-ClassElement
-name: class declaration
-path: language/statements/class/syntax-
-features: [class]
----*/
-
-class C {
-  /*{ methods }*/
-}
diff --git a/src/class-methods/syntax/class-expr.template b/src/class-methods/syntax/class-expr.template
deleted file mode 100644
index 7a0c64a32fdafc474a6a6dab702385fa03a8f8af..0000000000000000000000000000000000000000
--- a/src/class-methods/syntax/class-expr.template
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) 2018 Bloomberg LP. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: prod-ClassElement
-name: class expression
-path: language/expressions/class/syntax-
-features: [class]
----*/
-
-var C = class {
-  /*{ methods }*/
-};