diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt b/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt
index aa2d0199f562..0e75448a16aa 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt
@@ -5,5 +5,3 @@ fun bar(i: Int) {
 }
 
 // ELEMENT: i
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt.after
index 053505abab26..004cc223114d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt.after
@@ -5,5 +5,3 @@ fun bar(i: Int) {
 }
 
 // ELEMENT: i
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt
index 0f913c91584e..4a8c96865b00 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt
@@ -5,5 +5,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt.after
index fb2ae9bfb54e..5aeab2842240 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt.after
@@ -5,5 +5,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt
index 92b17b665fe1..eed859fab46d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt
@@ -5,5 +5,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt.after
index fb2ae9bfb54e..5aeab2842240 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt.after
@@ -5,5 +5,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt
index 92b17b665fe1..eed859fab46d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt
@@ -5,5 +5,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt.after
index fb2ae9bfb54e..5aeab2842240 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt.after
@@ -5,5 +5,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt
index c2d0fadecc87..92af737c80c9 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt
@@ -5,5 +5,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt.after
index de8fccf56b01..b7d3f1195f79 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt.after
@@ -5,5 +5,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt
index 155c323f0b8a..82d6149f2973 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt
@@ -6,5 +6,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt.after
index 994ed7dc32c3..6aee486f6ded 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt.after
@@ -6,5 +6,3 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt
index 980c06a2a3d4..4acee9b73f19 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt
@@ -7,5 +7,3 @@ fun bar() {
 fun getString(p: Int): String = ""
 
 //ELEMENT: getString
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt.after
index 1c36281f3f5a..983ab204ae89 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt.after
@@ -7,5 +7,3 @@ fun bar() {
 fun getString(p: Int): String = ""
 
 //ELEMENT: getString
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt
index acfba2bf61af..76f709e1c7b0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt
@@ -7,5 +7,3 @@ class C {
 }
 
 //ELEMENT: this
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt.after
index b1d0aeb41cbb..c827e9e7cb47 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt.after
@@ -7,5 +7,3 @@ class C {
 }
 
 //ELEMENT: this
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt
index 45e5f6d148b0..a84d6e2826a5 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt
@@ -10,5 +10,3 @@ fun bar(){
 }
 
 // ELEMENT: X
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt.after
index 62e6cf867190..82cfa4aa405e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt.after
@@ -10,5 +10,3 @@ fun bar(){
 }
 
 // ELEMENT: X
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt b/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt
index 779eb23395d1..010d20b6d525 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt
@@ -3,5 +3,3 @@ open class Base(p1: String, p2: String)
 class Derived(s: String) : Base(<caret>)
 
 // ELEMENT: s
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt.after b/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt.after
index 2d5cf9c5c6ea..db7a024fb871 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt.after
@@ -3,5 +3,3 @@ open class Base(p1: String, p2: String)
 class Derived(s: String) : Base(s, <caret>)
 
 // ELEMENT: s
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt b/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt
index b3a79def7550..73d0fb0cb2a7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt
@@ -4,5 +4,3 @@ fun foo(flag: Boolean) {
 
 // ELEMENT: flag
 // CHAR: '!'
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt.after
index 0563cdd9eccf..ca0b6311c4a8 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt.after
@@ -4,5 +4,3 @@ fun foo(flag: Boolean) {
 
 // ELEMENT: flag
 // CHAR: '!'
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt b/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt
index 7b203303754e..203d8c2a9400 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt
@@ -3,5 +3,3 @@ fun foo(map: Map<String, Int>, p: String) {
 }
 
 // ELEMENT: p
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt.after b/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt.after
index 966a35e37371..6dc7c60fee7b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt.after
@@ -3,5 +3,3 @@ fun foo(map: Map<String, Int>, p: String) {
 }
 
 // ELEMENT: p
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt b/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt
index 2c4f4a83e890..4dd09d7e81d0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt
@@ -3,5 +3,3 @@ fun bar(b: Boolean){
 }
 
 // ELEMENT: b
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt.after b/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt.after
index a2f86411e53d..d76d052354b5 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt.after
@@ -3,5 +3,3 @@ fun bar(b: Boolean){
 }
 
 // ELEMENT: b
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt b/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt
index 28f6ba21fd29..1062564b53b9 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt
@@ -5,5 +5,3 @@ fun bar(p1: String?, p2: String) {
 }
 
 // ELEMENT: p2
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt.after b/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt.after
index 7c0a44ebff02..9785c95357d2 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt.after
@@ -5,5 +5,3 @@ fun bar(p1: String?, p2: String) {
 }
 
 // ELEMENT: p2
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt
index c266e4e30dca..9bb01e4d5b80 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt
@@ -3,4 +3,3 @@ fun foo(list: List<String>) {
 }
 
 // ELEMENT: isEmpty
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt.after
index 19e02aafbbd5..7725dc194dda 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt.after
@@ -3,4 +3,3 @@ fun foo(list: List<String>) {
 }
 
 // ELEMENT: isEmpty
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt
index 45b162cdca88..2ac797bd303b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt
@@ -5,4 +5,3 @@ fun foo(list: List<String>) {
 }
 
 // ELEMENT: isEmpty
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt.after
index dd2fd9f5de60..74fec4a0d11e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt.after
@@ -5,4 +5,3 @@ fun foo(list: List<String>) {
 }
 
 // ELEMENT: isEmpty
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt b/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt
index c25c12bf8990..b55af545f3ba 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt
@@ -5,5 +5,3 @@ fun bar(p: Int) {
 }
 
 // ELEMENT: p
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt.after b/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt.after
index a348bf21c366..84e561688f20 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt.after
@@ -5,5 +5,3 @@ fun bar(p: Int) {
 }
 
 // ELEMENT: p
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt
index a7dc9dbf4dcd..bd44a2e13d3f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt
@@ -5,5 +5,3 @@ fun bar(pInt: Int) {
 }
 
 // ELEMENT: pInt
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt.after
index 0927ad0e8a88..e40d0cf214b1 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt.after
@@ -5,5 +5,3 @@ fun bar(pInt: Int) {
 }
 
 // ELEMENT: pInt
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt
index f172fdda0d63..815e6c4232cb 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt
@@ -5,5 +5,3 @@ fun bar(pInt: Int) {
 }
 
 // ELEMENT: pInt
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt.after
index b64f6d8068db..8caa3202447d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt.after
@@ -5,5 +5,3 @@ fun bar(pInt: Int) {
 }
 
 // ELEMENT: pInt
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt b/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt
index f665230baabb..6789ce1e2917 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt
@@ -6,5 +6,3 @@ fun bar() {
 }
 
 // ELEMENT_TEXT: "flag = true"
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt.after
index 75dadd49f8ae..bd3c95e87472 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt.after
@@ -6,5 +6,3 @@ fun bar() {
 }
 
 // ELEMENT_TEXT: "flag = true"
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt
index 172399ec2d50..b5c221933a08 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt
@@ -7,5 +7,3 @@ class Outer {
 }
 
 // ELEMENT: p
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt.after
index 225d009669f2..a0f10e5ef2e2 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt.after
@@ -7,5 +7,3 @@ class Outer {
 }
 
 // ELEMENT: p
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt
index 1046755e43f7..e38a91f933d8 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt
@@ -5,6 +5,3 @@ class `this` {
 }
 
 // ELEMENT: "this@`this`"
-
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt.after
index 0402b46d2520..23b688f175eb 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt.after
@@ -5,6 +5,3 @@ class `this` {
 }
 
 // ELEMENT: "this@`this`"
-
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt
index bc5da6dd7553..367723954dbf 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt
@@ -10,5 +10,3 @@ fun foo(){
 }
 
 // ELEMENT: this@`fun`
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt.after
index 8ecc2530d4f5..7f59de76c663 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt.after
@@ -10,5 +10,3 @@ fun foo(){
 }
 
 // ELEMENT: this@`fun`
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt b/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt
index cbbab400c8ca..c303070059ca 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt
@@ -5,5 +5,3 @@ fun bar(i: Int) {
 }
 
 // ELEMENT: i
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt.after b/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt.after
index 6574edce2efe..3be0942fd6b2 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt.after
@@ -5,5 +5,3 @@ fun bar(i: Int) {
 }
 
 // ELEMENT: i
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt b/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt
index dbc837180634..03997b8f16f7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt
@@ -1,7 +1,5 @@
-fun foo(map: Map<String, Int>, p: String) {
+fun foo(map: MutableMap<String, Int>, p: String) {
     map[<caret>] = 1
 }
 
 // ELEMENT: p
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt.after b/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt.after
index a619782f158d..c4e188e5d559 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt.after
@@ -1,7 +1,5 @@
-fun foo(map: Map<String, Int>, p: String) {
+fun foo(map: MutableMap<String, Int>, p: String) {
     map[p]<caret> = 1
 }
 
 // ELEMENT: p
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt
index c52339907f87..d6587ab40081 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt
@@ -6,5 +6,3 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt.after
index 055ceff2b68b..5c4cb9da1763 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt.after
@@ -6,5 +6,3 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt
index c1b46a11680e..4452b12e07b7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt
@@ -6,5 +6,3 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt.after
index 055ceff2b68b..5c4cb9da1763 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt.after
@@ -6,5 +6,3 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt
index 3728f8518bf3..898eebb979c7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt
@@ -6,5 +6,3 @@ fun bar(ss: String) {
 
 //ELEMENT: ss
 //CHAR: \t
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt.after
index 2fd8358424de..09a9ba993871 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt.after
@@ -6,5 +6,3 @@ fun bar(ss: String) {
 
 //ELEMENT: ss
 //CHAR: \t
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/True2.kt b/plugins/kotlin/completion/testData/handlers/smart/True2.kt
index 0b87845fa1f3..fe13081347bf 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/True2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/True2.kt
@@ -5,5 +5,3 @@ fun bar() {
 }
 
 // ELEMENT: true
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/True2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/True2.kt.after
index 73d9989d9e56..de4b2f06c22a 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/True2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/True2.kt.after
@@ -5,5 +5,3 @@ fun bar() {
 }
 
 // ELEMENT: true
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt b/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt
index 6fd4029c7650..5c535300b55f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt
@@ -5,5 +5,3 @@ fun bar(s: String){
 }
 
 // ELEMENT: s
-
-// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt.after b/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt.after
index a8883b8d0314..e0449cb63420 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt.after
@@ -5,5 +5,3 @@ fun bar(s: String){
 }
 
 // ELEMENT: s
-
-// IGNORE_K2