diff --git a/grammar/src/class.grm b/grammar/src/class.grm
index f66a6500ea5..042fedb006c 100644
--- a/grammar/src/class.grm
+++ b/grammar/src/class.grm
@@ -25,7 +25,7 @@ primaryConstructorParameters
 
 typeParameters
   : "<" typeParameter{","} ">"
-    ("where" typeConstraint{","})?  // TODO: Syntax is questionable
+    ("where" typeConstraint{","})?
   ;
 
 classBody
@@ -38,7 +38,7 @@ delegationSpecifier
   ;
 
 explicitDelegation
-  : userType "by" expression // internal this expression no foo {bar} is allowed // TODO: Syntax is questionable
+  : userType "by" expression // internal this expression no foo {bar} is allowed
   ;
 
 typeParameter
@@ -48,7 +48,6 @@ typeParameter
 typeConstraint
   : userType ":" type
   : "class" "object" userType ":" type
-  // TODO: other constraints, maybe
   ;
 
 primaryConstructorParameter
diff --git a/grammar/src/class_members.grm b/grammar/src/class_members.grm
index eec94bee2de..b3dc38fe885 100644
--- a/grammar/src/class_members.grm
+++ b/grammar/src/class_members.grm
@@ -96,7 +96,7 @@ getter
   ;
 
 setter
-  : modifiers "set" "(" modifiers (SimpleName | parameter) ")" functionBody // TODO: Can the parameter be lazy?
+  : modifiers "set" "(" modifiers (SimpleName | parameter) ")" functionBody
   ;
 
 parameter
diff --git a/grammar/src/expressions.grm b/grammar/src/expressions.grm
index 19911e594b3..8eb798a6840 100644
--- a/grammar/src/expressions.grm
+++ b/grammar/src/expressions.grm
@@ -86,7 +86,7 @@ atomicExpression
   : when
   : try
   : "typeof" "(" expression ")"
-  : "new" constructorInvocation // TODO: Do we need "new"?, see factory methods
+  : "new" constructorInvocation
   : objectLiteral
   : declaration
   : jump