diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
index 068e9e0bf3f..76c83715607 100644
--- a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+++ b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
@@ -861,8 +861,10 @@ public class JetParsing extends AbstractJetParsing {
             return FUN;
         }
 
+        boolean parameterListOccured = false;
         if (at(LT)) {
             parseTypeParameterList(TokenSet.create(LBRACKET, LBRACE, LPAR));
+            parameterListOccured = true;
         }
 
 
@@ -881,7 +883,16 @@ public class JetParsing extends AbstractJetParsing {
 
         TokenSet valueParametersFollow = TokenSet.create(COLON, EQ, LBRACE, SEMICOLON, RPAR);
 
-        parseTypeParameterList(TokenSet.orSet(TokenSet.create(LPAR), valueParametersFollow));
+        if (at(LT)) {
+            PsiBuilder.Marker error = mark();
+            parseTypeParameterList(TokenSet.orSet(TokenSet.create(LPAR), valueParametersFollow));
+            if (parameterListOccured) {
+                error.error("Only one type parameter list is allowed for a function"); // TODO : discuss
+            }
+            else {
+                error.drop();
+            }
+        }
 
         parseValueParameterList(false, valueParametersFollow);
 
diff --git a/idea/testData/psi/AnnotatedExpressions.txt b/idea/testData/psi/AnnotatedExpressions.txt
index aee085f5313..3ab88e58209 100644
--- a/idea/testData/psi/AnnotatedExpressions.txt
+++ b/idea/testData/psi/AnnotatedExpressions.txt
@@ -4,8 +4,6 @@ JetFile: AnnotatedExpressions.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/AttributesOnPatterns.txt b/idea/testData/psi/AttributesOnPatterns.txt
index 98401f1ba4e..beeaa74ce4b 100644
--- a/idea/testData/psi/AttributesOnPatterns.txt
+++ b/idea/testData/psi/AttributesOnPatterns.txt
@@ -4,8 +4,6 @@ JetFile: AttributesOnPatterns.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/ByCaluses.txt b/idea/testData/psi/ByCaluses.txt
index f9938af1ca2..e97a215eb42 100644
--- a/idea/testData/psi/ByCaluses.txt
+++ b/idea/testData/psi/ByCaluses.txt
@@ -302,8 +302,6 @@ JetFile: ByCaluses.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('f')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/CallsInWhen.txt b/idea/testData/psi/CallsInWhen.txt
index 274a1947ef5..a3095fba9c2 100644
--- a/idea/testData/psi/CallsInWhen.txt
+++ b/idea/testData/psi/CallsInWhen.txt
@@ -4,8 +4,6 @@ JetFile: CallsInWhen.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/ControlStructures.txt b/idea/testData/psi/ControlStructures.txt
index 644a425edd0..3411f273ec0 100644
--- a/idea/testData/psi/ControlStructures.txt
+++ b/idea/testData/psi/ControlStructures.txt
@@ -4,8 +4,6 @@ JetFile: ControlStructures.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('a')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiWhiteSpace('\n    ')
@@ -588,8 +586,6 @@ JetFile: ControlStructures.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/EOLsInComments.txt b/idea/testData/psi/EOLsInComments.txt
index f5b55e49b28..c74b9a17704 100644
--- a/idea/testData/psi/EOLsInComments.txt
+++ b/idea/testData/psi/EOLsInComments.txt
@@ -4,8 +4,6 @@ JetFile: EOLsInComments.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/EOLsOnRollback.txt b/idea/testData/psi/EOLsOnRollback.txt
index bbd1c270ff7..4ce26ff7333 100644
--- a/idea/testData/psi/EOLsOnRollback.txt
+++ b/idea/testData/psi/EOLsOnRollback.txt
@@ -4,8 +4,6 @@ JetFile: EOLsOnRollback.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -24,8 +22,6 @@ JetFile: EOLsOnRollback.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('foo')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/FunctionCalls.txt b/idea/testData/psi/FunctionCalls.txt
index a4c43ab3dac..bbe883fb015 100644
--- a/idea/testData/psi/FunctionCalls.txt
+++ b/idea/testData/psi/FunctionCalls.txt
@@ -4,8 +4,6 @@ JetFile: FunctionCalls.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/FunctionLiterals.txt b/idea/testData/psi/FunctionLiterals.txt
index d94c3036e8c..c93583fdf25 100644
--- a/idea/testData/psi/FunctionLiterals.txt
+++ b/idea/testData/psi/FunctionLiterals.txt
@@ -4,8 +4,6 @@ JetFile: FunctionLiterals.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/FunctionLiterals_ERR.txt b/idea/testData/psi/FunctionLiterals_ERR.txt
index 6391bd38873..b91f2080ffc 100644
--- a/idea/testData/psi/FunctionLiterals_ERR.txt
+++ b/idea/testData/psi/FunctionLiterals_ERR.txt
@@ -4,8 +4,6 @@ JetFile: FunctionLiterals_ERR.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/Functions.txt b/idea/testData/psi/Functions.txt
index e114ec07777..ef0b279c78a 100644
--- a/idea/testData/psi/Functions.txt
+++ b/idea/testData/psi/Functions.txt
@@ -4,8 +4,6 @@ JetFile: Functions.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -23,8 +21,6 @@ JetFile: Functions.jet
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -47,8 +43,6 @@ JetFile: Functions.jet
             PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -107,8 +101,6 @@ JetFile: Functions.jet
           PsiElement(RBRACE)('}')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -131,8 +123,6 @@ JetFile: Functions.jet
             PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -225,8 +215,6 @@ JetFile: Functions.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -245,8 +233,6 @@ JetFile: Functions.jet
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -270,8 +256,6 @@ JetFile: Functions.jet
             PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -331,8 +315,6 @@ JetFile: Functions.jet
           PsiElement(RBRACE)('}')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -356,8 +338,6 @@ JetFile: Functions.jet
             PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -452,8 +432,6 @@ JetFile: Functions.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -475,8 +453,6 @@ JetFile: Functions.jet
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -503,8 +479,6 @@ JetFile: Functions.jet
             PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -567,8 +541,6 @@ JetFile: Functions.jet
           PsiElement(RBRACE)('}')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -595,8 +567,6 @@ JetFile: Functions.jet
             PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -756,8 +726,6 @@ JetFile: Functions.jet
           PsiElement(RBRACE)('}')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/Functions_ERR.txt b/idea/testData/psi/Functions_ERR.txt
index 7846fa530be..90ac9efa5ea 100644
--- a/idea/testData/psi/Functions_ERR.txt
+++ b/idea/testData/psi/Functions_ERR.txt
@@ -4,8 +4,6 @@ JetFile: Functions_ERR.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiErrorElement:Expecting '(
           <empty list>
@@ -25,8 +23,6 @@ JetFile: Functions_ERR.jet
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('f')
       PsiWhiteSpace(' ')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiErrorElement:Expecting '(
           PsiElement(IDENTIFIER)('foo')
@@ -55,8 +51,6 @@ JetFile: Functions_ERR.jet
             PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -370,8 +364,6 @@ JetFile: Functions_ERR.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -442,8 +434,6 @@ JetFile: Functions_ERR.jet
       PsiElement(DOT)('.')
       PsiErrorElement:Expecting function name
         PsiElement(MINUS)('-')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
\ No newline at end of file
diff --git a/idea/testData/psi/Labels.txt b/idea/testData/psi/Labels.txt
index 422cafa58e8..ab9aff54e8f 100644
--- a/idea/testData/psi/Labels.txt
+++ b/idea/testData/psi/Labels.txt
@@ -4,8 +4,6 @@ JetFile: Labels.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/LocalDeclarations.txt b/idea/testData/psi/LocalDeclarations.txt
index 7ac43948697..38e3638aa52 100644
--- a/idea/testData/psi/LocalDeclarations.txt
+++ b/idea/testData/psi/LocalDeclarations.txt
@@ -4,8 +4,6 @@ JetFile: LocalDeclarations.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/ModifierAsSelector.txt b/idea/testData/psi/ModifierAsSelector.txt
index ac832441ecf..cbc19b0cb15 100644
--- a/idea/testData/psi/ModifierAsSelector.txt
+++ b/idea/testData/psi/ModifierAsSelector.txt
@@ -20,8 +20,6 @@ JetFile: ModifierAsSelector.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/NewlinesInParentheses.txt b/idea/testData/psi/NewlinesInParentheses.txt
index 94d41052376..1f28093f420 100644
--- a/idea/testData/psi/NewlinesInParentheses.txt
+++ b/idea/testData/psi/NewlinesInParentheses.txt
@@ -4,8 +4,6 @@ JetFile: NewlinesInParentheses.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/Precedence.txt b/idea/testData/psi/Precedence.txt
index a3a6423fc6a..ddbdcb0251f 100644
--- a/idea/testData/psi/Precedence.txt
+++ b/idea/testData/psi/Precedence.txt
@@ -4,8 +4,6 @@ JetFile: Precedence.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/PredicateExpression.txt b/idea/testData/psi/PredicateExpression.txt
index 2ad9ccd1a2a..5992038b6fa 100644
--- a/idea/testData/psi/PredicateExpression.txt
+++ b/idea/testData/psi/PredicateExpression.txt
@@ -4,8 +4,6 @@ JetFile: PredicateExpression.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/Properties.txt b/idea/testData/psi/Properties.txt
index a6cc1090297..8b3c1c5af91 100644
--- a/idea/testData/psi/Properties.txt
+++ b/idea/testData/psi/Properties.txt
@@ -674,8 +674,6 @@ JetFile: Properties.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/QuotedIdentifiers.txt b/idea/testData/psi/QuotedIdentifiers.txt
index c60f759af6f..82c11dee630 100644
--- a/idea/testData/psi/QuotedIdentifiers.txt
+++ b/idea/testData/psi/QuotedIdentifiers.txt
@@ -14,8 +14,6 @@ JetFile: QuotedIdentifiers.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('`namespace`')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/RootNamespace.txt b/idea/testData/psi/RootNamespace.txt
index bb9de477c86..36f3bf77468 100644
--- a/idea/testData/psi/RootNamespace.txt
+++ b/idea/testData/psi/RootNamespace.txt
@@ -30,8 +30,6 @@ JetFile: RootNamespace.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('foo')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/SemicolonAfterIf.txt b/idea/testData/psi/SemicolonAfterIf.txt
index 54ec05a25de..fc8ce749f01 100644
--- a/idea/testData/psi/SemicolonAfterIf.txt
+++ b/idea/testData/psi/SemicolonAfterIf.txt
@@ -4,8 +4,6 @@ JetFile: SemicolonAfterIf.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
diff --git a/idea/testData/psi/SimpleClassMembers.txt b/idea/testData/psi/SimpleClassMembers.txt
index 06b9f7754fd..348258ca22c 100644
--- a/idea/testData/psi/SimpleClassMembers.txt
+++ b/idea/testData/psi/SimpleClassMembers.txt
@@ -61,8 +61,6 @@ JetFile: SimpleClassMembers.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('foo')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 PsiElement(RPAR)(')')
@@ -304,8 +302,6 @@ JetFile: SimpleClassMembers.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('foo')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 PsiElement(RPAR)(')')
@@ -390,8 +386,6 @@ JetFile: SimpleClassMembers.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('foo')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/SimpleClassMembers_ERR.txt b/idea/testData/psi/SimpleClassMembers_ERR.txt
index 273b233a20e..68d1fc18421 100644
--- a/idea/testData/psi/SimpleClassMembers_ERR.txt
+++ b/idea/testData/psi/SimpleClassMembers_ERR.txt
@@ -51,8 +51,6 @@ JetFile: SimpleClassMembers_ERR.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('foo')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/SimpleExpressions.txt b/idea/testData/psi/SimpleExpressions.txt
index ca1bbc6aad4..e49f6e8fc81 100644
--- a/idea/testData/psi/SimpleExpressions.txt
+++ b/idea/testData/psi/SimpleExpressions.txt
@@ -4,8 +4,6 @@ JetFile: SimpleExpressions.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('a')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiWhiteSpace('\n    ')
diff --git a/idea/testData/psi/SoftKeywords.txt b/idea/testData/psi/SoftKeywords.txt
index ef481f3943a..68aaec1fd2f 100644
--- a/idea/testData/psi/SoftKeywords.txt
+++ b/idea/testData/psi/SoftKeywords.txt
@@ -322,8 +322,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('abstract')
           PsiWhiteSpace('  ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -340,8 +338,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('virtual')
           PsiWhiteSpace('   ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -358,8 +354,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('enum')
           PsiWhiteSpace('      ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -376,8 +370,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('open')
           PsiWhiteSpace('      ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -394,8 +386,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('attribute')
           PsiWhiteSpace(' ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -412,8 +402,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('override')
           PsiWhiteSpace('  ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -430,8 +418,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('virtual')
           PsiWhiteSpace('   ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -448,8 +434,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('abstract')
           PsiWhiteSpace('  ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -466,8 +450,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('private')
           PsiWhiteSpace('   ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -484,8 +466,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('protected')
           PsiWhiteSpace(' ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -502,8 +482,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('public')
           PsiWhiteSpace('    ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -520,8 +498,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('internal')
           PsiWhiteSpace('  ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -538,8 +514,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('lazy')
           PsiWhiteSpace('      ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -556,8 +530,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('wraps')
           PsiWhiteSpace('     ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -574,8 +546,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('import')
           PsiWhiteSpace('    ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -592,8 +562,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('where')
           PsiWhiteSpace('     ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -610,8 +578,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('by')
           PsiWhiteSpace('        ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -628,8 +594,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('get')
           PsiWhiteSpace('       ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -646,8 +610,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('set')
           PsiWhiteSpace('       ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -664,8 +626,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('public')
           PsiWhiteSpace('    ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -682,8 +642,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('private')
           PsiWhiteSpace('   ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -700,8 +658,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('protected')
           PsiWhiteSpace(' ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -718,8 +674,6 @@ JetFile: SoftKeywords.jet
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('internal')
           PsiWhiteSpace('  ')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -735,8 +689,6 @@ JetFile: SoftKeywords.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('test')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiWhiteSpace('\n        ')
diff --git a/idea/testData/psi/SoftKeywordsInTypeArguments.txt b/idea/testData/psi/SoftKeywordsInTypeArguments.txt
index b1ae12ce4df..ebaa0fcb051 100644
--- a/idea/testData/psi/SoftKeywordsInTypeArguments.txt
+++ b/idea/testData/psi/SoftKeywordsInTypeArguments.txt
@@ -28,8 +28,6 @@ JetFile: SoftKeywordsInTypeArguments.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('f')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/ThisType.txt b/idea/testData/psi/ThisType.txt
index 91e8a1667bb..8e47c2c60d9 100644
--- a/idea/testData/psi/ThisType.txt
+++ b/idea/testData/psi/ThisType.txt
@@ -97,8 +97,6 @@ JetFile: ThisType.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('foo')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt b/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt
index 1f37b714269..636c284bbea 100644
--- a/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt
+++ b/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt
@@ -4,8 +4,6 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/TypeParametersBeforeName.txt b/idea/testData/psi/TypeParametersBeforeName.txt
index db72372ebb8..b52c571ead0 100644
--- a/idea/testData/psi/TypeParametersBeforeName.txt
+++ b/idea/testData/psi/TypeParametersBeforeName.txt
@@ -14,8 +14,6 @@ JetFile: TypeParametersBeforeName.jet
         PsiElement(GT)('>')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -43,8 +41,6 @@ JetFile: TypeParametersBeforeName.jet
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -77,8 +73,6 @@ JetFile: TypeParametersBeforeName.jet
             PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -121,8 +115,6 @@ JetFile: TypeParametersBeforeName.jet
           PsiElement(RBRACE)('}')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/When.txt b/idea/testData/psi/When.txt
index 0c5f8311f32..ce04da868f3 100644
--- a/idea/testData/psi/When.txt
+++ b/idea/testData/psi/When.txt
@@ -4,8 +4,6 @@ JetFile: When.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -23,8 +21,6 @@ JetFile: When.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('a')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -67,8 +63,6 @@ JetFile: When.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('b')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -83,8 +77,6 @@ JetFile: When.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -423,8 +415,6 @@ JetFile: When.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -1045,8 +1035,6 @@ JetFile: When.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/When_ERR.txt b/idea/testData/psi/When_ERR.txt
index 2fc8995909f..4f00772aab9 100644
--- a/idea/testData/psi/When_ERR.txt
+++ b/idea/testData/psi/When_ERR.txt
@@ -4,8 +4,6 @@ JetFile: When_ERR.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/AnonymousObjects.txt b/idea/testData/psi/examples/AnonymousObjects.txt
index 415b88a11a9..9cd62feeeec 100644
--- a/idea/testData/psi/examples/AnonymousObjects.txt
+++ b/idea/testData/psi/examples/AnonymousObjects.txt
@@ -4,8 +4,6 @@ JetFile: AnonymousObjects.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -56,8 +54,6 @@ JetFile: AnonymousObjects.jet
                     PsiElement(fun)('fun')
                     PsiWhiteSpace(' ')
                     PsiElement(IDENTIFIER)('mouseClicked')
-                    TYPE_PARAMETER_LIST
-                      <empty list>
                     VALUE_PARAMETER_LIST
                       PsiElement(LPAR)('(')
                       VALUE_PARAMETER
@@ -166,8 +162,6 @@ JetFile: AnonymousObjects.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('sendMessage')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/BinaryTree.txt b/idea/testData/psi/examples/BinaryTree.txt
index b36610f5e51..ab177ef66d9 100644
--- a/idea/testData/psi/examples/BinaryTree.txt
+++ b/idea/testData/psi/examples/BinaryTree.txt
@@ -257,8 +257,6 @@ JetFile: BinaryTree.jet
                 PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           PsiElement(IDENTIFIER)('compareTo')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -303,8 +301,6 @@ JetFile: BinaryTree.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('contains')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -350,8 +346,6 @@ JetFile: BinaryTree.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('contains')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -509,8 +503,6 @@ JetFile: BinaryTree.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -596,8 +588,6 @@ JetFile: BinaryTree.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('add')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -788,8 +778,6 @@ JetFile: BinaryTree.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('addNoRef')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -1088,8 +1076,6 @@ JetFile: BinaryTree.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('remove')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -1190,8 +1176,6 @@ JetFile: BinaryTree.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('find')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -1329,8 +1313,6 @@ JetFile: BinaryTree.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('remove')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -1575,8 +1557,6 @@ JetFile: BinaryTree.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('replace')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -1767,8 +1747,6 @@ JetFile: BinaryTree.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('min')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -1835,8 +1813,6 @@ JetFile: BinaryTree.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('iterator')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -1872,8 +1848,6 @@ JetFile: BinaryTree.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('mutableIterator')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -2031,8 +2005,6 @@ JetFile: BinaryTree.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('next')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
@@ -2110,8 +2082,6 @@ JetFile: BinaryTree.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('nextNode')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
@@ -2436,8 +2406,6 @@ JetFile: BinaryTree.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('remove')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
@@ -2525,8 +2493,6 @@ JetFile: BinaryTree.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('checkVersion')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/BitArith.txt b/idea/testData/psi/examples/BitArith.txt
index 14e6c1a9675..97a62fdee77 100644
--- a/idea/testData/psi/examples/BitArith.txt
+++ b/idea/testData/psi/examples/BitArith.txt
@@ -4,8 +4,6 @@ JetFile: BitArith.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('oneBit')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -35,8 +33,6 @@ JetFile: BitArith.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('setBit')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -84,8 +80,6 @@ JetFile: BitArith.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('unsetBit')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -140,8 +134,6 @@ JetFile: BitArith.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('getBit')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -196,8 +188,6 @@ JetFile: BitArith.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('getBit')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -255,8 +245,6 @@ JetFile: BitArith.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('countOnes')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -349,8 +337,6 @@ JetFile: BitArith.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('mostSignificantBit')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -417,8 +403,6 @@ JetFile: BitArith.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('countOnes')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -497,8 +481,6 @@ JetFile: BitArith.jet
             PsiElement(IDENTIFIER)('Int')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('matchMask')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -586,8 +568,6 @@ JetFile: BitArith.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('plus')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -620,8 +600,6 @@ JetFile: BitArith.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('shl')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/Builder.txt b/idea/testData/psi/examples/Builder.txt
index aae5a7cdfd5..0dd1be90a5c 100644
--- a/idea/testData/psi/examples/Builder.txt
+++ b/idea/testData/psi/examples/Builder.txt
@@ -250,8 +250,6 @@ JetFile: Builder.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('classpath')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -289,8 +287,6 @@ JetFile: Builder.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('src')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -336,8 +332,6 @@ JetFile: Builder.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('classpath')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -365,8 +359,6 @@ JetFile: Builder.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('library')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -440,8 +432,6 @@ JetFile: Builder.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('classpath')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiComment(BLOCK_COMMENT)('/*...*/')
@@ -451,8 +441,6 @@ JetFile: Builder.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('module')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiComment(BLOCK_COMMENT)('/*...*/')
diff --git a/idea/testData/psi/examples/FunctionsAndTypes.txt b/idea/testData/psi/examples/FunctionsAndTypes.txt
index 04d65ce6475..eb5b9249016 100644
--- a/idea/testData/psi/examples/FunctionsAndTypes.txt
+++ b/idea/testData/psi/examples/FunctionsAndTypes.txt
@@ -487,8 +487,6 @@ JetFile: FunctionsAndTypes.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('f1')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/Graph.txt b/idea/testData/psi/examples/Graph.txt
index 2426ae2d112..ba398dacba3 100644
--- a/idea/testData/psi/examples/Graph.txt
+++ b/idea/testData/psi/examples/Graph.txt
@@ -266,8 +266,6 @@ JetFile: Graph.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('addEdge')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -349,8 +347,6 @@ JetFile: Graph.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('addVertex')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -410,8 +406,6 @@ JetFile: Graph.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('neighbours')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -481,8 +475,6 @@ JetFile: Graph.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('dfs')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -583,8 +575,6 @@ JetFile: Graph.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('dfs')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -748,8 +738,6 @@ JetFile: Graph.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('traverse')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/IPushPop.txt b/idea/testData/psi/examples/IPushPop.txt
index 0f161fcd6cf..8aba5674908 100644
--- a/idea/testData/psi/examples/IPushPop.txt
+++ b/idea/testData/psi/examples/IPushPop.txt
@@ -32,8 +32,6 @@ JetFile: IPushPop.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('push')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -51,8 +49,6 @@ JetFile: IPushPop.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('pop')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/LINQ.txt b/idea/testData/psi/examples/LINQ.txt
index 93349c6e549..bbeb7834d52 100644
--- a/idea/testData/psi/examples/LINQ.txt
+++ b/idea/testData/psi/examples/LINQ.txt
@@ -4,8 +4,6 @@ JetFile: LINQ.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/PolymorphicClassObjects.txt b/idea/testData/psi/examples/PolymorphicClassObjects.txt
index 1fce68ffc9d..94892ef2007 100644
--- a/idea/testData/psi/examples/PolymorphicClassObjects.txt
+++ b/idea/testData/psi/examples/PolymorphicClassObjects.txt
@@ -34,8 +34,6 @@ JetFile: PolymorphicClassObjects.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('plusAssign')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -53,8 +51,6 @@ JetFile: PolymorphicClassObjects.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('result')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/Queue.txt b/idea/testData/psi/examples/Queue.txt
index 2d722ad9a83..a81c41fa61f 100644
--- a/idea/testData/psi/examples/Queue.txt
+++ b/idea/testData/psi/examples/Queue.txt
@@ -141,8 +141,6 @@ JetFile: Queue.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('push')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -265,8 +263,6 @@ JetFile: Queue.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('pop')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/Stack.txt b/idea/testData/psi/examples/Stack.txt
index c2db4a7c3e7..5c410083db7 100644
--- a/idea/testData/psi/examples/Stack.txt
+++ b/idea/testData/psi/examples/Stack.txt
@@ -67,8 +67,6 @@ JetFile: Stack.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('push')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -110,8 +108,6 @@ JetFile: Stack.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('pop')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/UnionFind.txt b/idea/testData/psi/examples/UnionFind.txt
index d994b6a5d1c..2bdfe60746e 100644
--- a/idea/testData/psi/examples/UnionFind.txt
+++ b/idea/testData/psi/examples/UnionFind.txt
@@ -39,8 +39,6 @@ JetFile: UnionFind.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -95,8 +93,6 @@ JetFile: UnionFind.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('parent')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -208,8 +204,6 @@ JetFile: UnionFind.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('union')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/UpdateOperation.txt b/idea/testData/psi/examples/UpdateOperation.txt
index f94e7636281..37975d5dd05 100644
--- a/idea/testData/psi/examples/UpdateOperation.txt
+++ b/idea/testData/psi/examples/UpdateOperation.txt
@@ -46,8 +46,6 @@ JetFile: UpdateOperation.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('copy')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/With.txt b/idea/testData/psi/examples/With.txt
index 051cdb7e40f..8bea79b6b5d 100644
--- a/idea/testData/psi/examples/With.txt
+++ b/idea/testData/psi/examples/With.txt
@@ -75,8 +75,6 @@ JetFile: With.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('example')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/array/MutableArray.txt b/idea/testData/psi/examples/array/MutableArray.txt
index bd4332a4f2e..abdd694b61d 100644
--- a/idea/testData/psi/examples/array/MutableArray.txt
+++ b/idea/testData/psi/examples/array/MutableArray.txt
@@ -44,8 +44,6 @@ JetFile: MutableArray.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('get')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -112,8 +110,6 @@ JetFile: MutableArray.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('set')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/collections/ArrayList.txt b/idea/testData/psi/examples/collections/ArrayList.txt
index 341124ab0e1..34d628715aa 100644
--- a/idea/testData/psi/examples/collections/ArrayList.txt
+++ b/idea/testData/psi/examples/collections/ArrayList.txt
@@ -83,8 +83,6 @@ JetFile: ArrayList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('iterator')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -120,8 +118,6 @@ JetFile: ArrayList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('mutableIterator')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -194,8 +190,6 @@ JetFile: ArrayList.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('checkVersion')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
@@ -243,8 +237,6 @@ JetFile: ArrayList.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('next')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
@@ -329,8 +321,6 @@ JetFile: ArrayList.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('remove')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
@@ -401,8 +391,6 @@ JetFile: ArrayList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('get')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -447,8 +435,6 @@ JetFile: ArrayList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('checkIndex')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -551,8 +537,6 @@ JetFile: ArrayList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('set')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -634,8 +618,6 @@ JetFile: ArrayList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -851,8 +833,6 @@ JetFile: ArrayList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('remove')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/collections/HashMap.txt b/idea/testData/psi/examples/collections/HashMap.txt
index 80067516cd3..a4ff6f08621 100644
--- a/idea/testData/psi/examples/collections/HashMap.txt
+++ b/idea/testData/psi/examples/collections/HashMap.txt
@@ -17,8 +17,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('equals')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -192,8 +190,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('get')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -218,8 +214,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('set')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -255,8 +249,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('remove')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -281,8 +273,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('containsKey')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -359,8 +349,6 @@ JetFile: HashMap.jet
             PsiElement(IDENTIFIER)('Any')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('hashable')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -408,8 +396,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('equals')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -445,8 +431,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('hashCode')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -516,8 +500,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('equals')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -572,8 +554,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('hashCode')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -642,8 +622,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('equals')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -706,8 +684,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('hashCode')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -804,8 +780,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('hashCode')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -852,8 +826,6 @@ JetFile: HashMap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('equals')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/collections/IIterable.txt b/idea/testData/psi/examples/collections/IIterable.txt
index ad43b694cb8..fba44fb97b1 100644
--- a/idea/testData/psi/examples/collections/IIterable.txt
+++ b/idea/testData/psi/examples/collections/IIterable.txt
@@ -23,8 +23,6 @@ JetFile: IIterable.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('iterator')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/collections/IIterator.txt b/idea/testData/psi/examples/collections/IIterator.txt
index 11352ac0c70..0b30ac70447 100644
--- a/idea/testData/psi/examples/collections/IIterator.txt
+++ b/idea/testData/psi/examples/collections/IIterator.txt
@@ -23,8 +23,6 @@ JetFile: IIterator.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('next')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -52,8 +50,6 @@ JetFile: IIterator.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('toArray')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -123,8 +119,6 @@ JetFile: IIterator.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('toArray')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/collections/IList.txt b/idea/testData/psi/examples/collections/IList.txt
index 578fb647485..b4fbd703ec8 100644
--- a/idea/testData/psi/examples/collections/IList.txt
+++ b/idea/testData/psi/examples/collections/IList.txt
@@ -57,8 +57,6 @@ JetFile: IList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('get')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/collections/IMutableIterable.txt b/idea/testData/psi/examples/collections/IMutableIterable.txt
index 8aa4d7722b3..14d939be026 100644
--- a/idea/testData/psi/examples/collections/IMutableIterable.txt
+++ b/idea/testData/psi/examples/collections/IMutableIterable.txt
@@ -40,8 +40,6 @@ JetFile: IMutableIterable.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('mutableIterator')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/collections/IMutableIterator.txt b/idea/testData/psi/examples/collections/IMutableIterator.txt
index 5befc2f8951..1014211edea 100644
--- a/idea/testData/psi/examples/collections/IMutableIterator.txt
+++ b/idea/testData/psi/examples/collections/IMutableIterator.txt
@@ -40,8 +40,6 @@ JetFile: IMutableIterator.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('remove')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/collections/IMutableList.txt b/idea/testData/psi/examples/collections/IMutableList.txt
index dfe68c13583..ec023e54ba4 100644
--- a/idea/testData/psi/examples/collections/IMutableList.txt
+++ b/idea/testData/psi/examples/collections/IMutableList.txt
@@ -52,8 +52,6 @@ JetFile: IMutableList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('set')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -89,8 +87,6 @@ JetFile: IMutableList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -119,8 +115,6 @@ JetFile: IMutableList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('remove')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -145,8 +139,6 @@ JetFile: IMutableList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('mutableIterator')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/collections/IMutableSet.txt b/idea/testData/psi/examples/collections/IMutableSet.txt
index c92af547c96..50c295b41c5 100644
--- a/idea/testData/psi/examples/collections/IMutableSet.txt
+++ b/idea/testData/psi/examples/collections/IMutableSet.txt
@@ -52,8 +52,6 @@ JetFile: IMutableSet.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -78,8 +76,6 @@ JetFile: IMutableSet.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('remove')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/collections/ISet.txt b/idea/testData/psi/examples/collections/ISet.txt
index 8f77fe55c91..11afd7dc48d 100644
--- a/idea/testData/psi/examples/collections/ISet.txt
+++ b/idea/testData/psi/examples/collections/ISet.txt
@@ -44,8 +44,6 @@ JetFile: ISet.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('contains')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/collections/LinkedList.txt b/idea/testData/psi/examples/collections/LinkedList.txt
index 294a717c708..f8c1db7c4f9 100644
--- a/idea/testData/psi/examples/collections/LinkedList.txt
+++ b/idea/testData/psi/examples/collections/LinkedList.txt
@@ -147,8 +147,6 @@ JetFile: LinkedList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -389,8 +387,6 @@ JetFile: LinkedList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('checkIndex')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -462,8 +458,6 @@ JetFile: LinkedList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('remove')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -705,8 +699,6 @@ JetFile: LinkedList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('set')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -811,8 +803,6 @@ JetFile: LinkedList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('itemAt')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -894,8 +884,6 @@ JetFile: LinkedList.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('mutableIterator')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/collections/List.txt b/idea/testData/psi/examples/collections/List.txt
index 4b0bdd0658a..88bffdc19c6 100644
--- a/idea/testData/psi/examples/collections/List.txt
+++ b/idea/testData/psi/examples/collections/List.txt
@@ -217,8 +217,6 @@ JetFile: List.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('iterator')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -290,8 +288,6 @@ JetFile: List.jet
                 PsiElement(fun)('fun')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('next')
-                TYPE_PARAMETER_LIST
-                  <empty list>
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/io/IOSamples.txt b/idea/testData/psi/examples/io/IOSamples.txt
index 3ea0d1c9fc5..5170f1c0c43 100644
--- a/idea/testData/psi/examples/io/IOSamples.txt
+++ b/idea/testData/psi/examples/io/IOSamples.txt
@@ -23,8 +23,6 @@ JetFile: IOSamples.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -64,8 +62,6 @@ JetFile: IOSamples.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('close')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -340,8 +336,6 @@ JetFile: IOSamples.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('next')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -607,8 +601,6 @@ JetFile: IOSamples.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -647,8 +639,6 @@ JetFile: IOSamples.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('example')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
diff --git a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt
index b239b7ca9b6..2db7592495f 100644
--- a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt
+++ b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt
@@ -372,8 +372,6 @@ JetFile: BinaryHeap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('extract')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -472,8 +470,6 @@ JetFile: BinaryHeap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -527,8 +523,6 @@ JetFile: BinaryHeap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('siftDown')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -760,8 +754,6 @@ JetFile: BinaryHeap.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('siftUp')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
@@ -1188,8 +1180,6 @@ JetFile: BinaryHeap.jet
               PsiElement(fun)('fun')
               PsiWhiteSpace(' ')
               PsiElement(IDENTIFIER)('compareTo')
-              TYPE_PARAMETER_LIST
-                <empty list>
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 VALUE_PARAMETER
@@ -1248,8 +1238,6 @@ JetFile: BinaryHeap.jet
             PsiElement(GT)('>')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('swap')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt b/idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt
index abd8fcade74..340dac8a68c 100644
--- a/idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt
+++ b/idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt
@@ -20,8 +20,6 @@ JetFile: IPriorityQueue.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('extract')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -37,8 +35,6 @@ JetFile: IPriorityQueue.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('add')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
index d417abf5bea..504d73ee76e 100644
--- a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
+++ b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
@@ -59,8 +59,6 @@ JetFile: PriorityQueueAsPushPop.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('pop')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
@@ -85,8 +83,6 @@ JetFile: PriorityQueueAsPushPop.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('push')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/util/Comparison.txt b/idea/testData/psi/examples/util/Comparison.txt
index ba8bf505cda..a46659067cb 100644
--- a/idea/testData/psi/examples/util/Comparison.txt
+++ b/idea/testData/psi/examples/util/Comparison.txt
@@ -120,8 +120,6 @@ JetFile: Comparison.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('castingNaturalOrder')
-      TYPE_PARAMETER_LIST
-        <empty list>
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
diff --git a/idea/testData/psi/examples/util/IComparable.txt b/idea/testData/psi/examples/util/IComparable.txt
index 2f098ba67f0..1fd73634c0d 100644
--- a/idea/testData/psi/examples/util/IComparable.txt
+++ b/idea/testData/psi/examples/util/IComparable.txt
@@ -23,8 +23,6 @@ JetFile: IComparable.jet
           PsiElement(fun)('fun')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('compareTo')
-          TYPE_PARAMETER_LIST
-            <empty list>
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER