diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockExpression.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockExpression.java
index fd4f3248d62..9ddcb7113a0 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockExpression.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockExpression.java
@@ -20,7 +20,6 @@ import com.intellij.lang.Language;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiModifiableCodeBlock;
 import com.intellij.psi.impl.source.tree.CompositeElement;
 import com.intellij.psi.impl.source.tree.LazyParseablePsiElement;
 import com.intellij.psi.util.PsiUtilCore;
@@ -40,13 +39,13 @@ import java.util.List;
 import static org.jetbrains.kotlin.KtNodeTypes.BLOCK;
 
 @SuppressWarnings("deprecation")
-public class KtBlockExpression extends LazyParseablePsiElement implements KtElement, KtExpression, KtStatementExpression, PsiModifiableCodeBlock {
+public class KtBlockExpression extends LazyParseablePsiElement implements KtElement, KtExpression, KtStatementExpression {
 
     public KtBlockExpression(@Nullable CharSequence text) {
         super(BLOCK, text);
     }
 
-    @Override
+    @SuppressWarnings({"unused", "MethodMayBeStatic"}) //keep for compatibility with potential plugins
     public boolean shouldChangeModificationCount(PsiElement place) {
         // To prevent OutOfBlockModification increase from JavaCodeBlockModificationListener
         return false;
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt
index b8f08a27d0a..cf614486282 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtFile.kt
@@ -45,8 +45,7 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) :
     KtAnnotated,
     KtElement,
     PsiClassOwner,
-    PsiNamedElement,
-    PsiModifiableCodeBlock {
+    PsiNamedElement {
 
     @Volatile
     private var isScript: Boolean? = null
@@ -295,7 +294,8 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) :
 
     override fun getPsiOrParent(): KtElement = this
 
-    override fun shouldChangeModificationCount(place: PsiElement): Boolean {
+    @Suppress("unused") //keep for compatibility with potential plugins
+    fun shouldChangeModificationCount(@Suppress("UNUSED_PARAMETER") place: PsiElement): Boolean {
         // Modification count for Kotlin files is tracked entirely by KotlinCodeBlockModificationListener
         return false
     }
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtLambdaExpression.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtLambdaExpression.java
index 98ffd6b32ef..9b5137dbc3e 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtLambdaExpression.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtLambdaExpression.java
@@ -19,8 +19,6 @@ package org.jetbrains.kotlin.psi;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiModifiableCodeBlock;
 import com.intellij.psi.impl.source.tree.LazyParseablePsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -30,7 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt;
 
 import java.util.List;
 
-public class KtLambdaExpression extends LazyParseablePsiElement implements KtExpression, PsiModifiableCodeBlock {
+public class KtLambdaExpression extends LazyParseablePsiElement implements KtExpression {
     public KtLambdaExpression(CharSequence text) {
         super(KtNodeTypes.LAMBDA_EXPRESSION, text);
     }
@@ -107,7 +105,7 @@ public class KtLambdaExpression extends LazyParseablePsiElement implements KtExp
         return this;
     }
 
-    @Override
+    @SuppressWarnings({"unused", "MethodMayBeStatic"}) //keep for compatibility with potential plugins
     public boolean shouldChangeModificationCount(PsiElement place) {
         return false;
     }
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtNamedFunction.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtNamedFunction.java
index 0e1d4e471da..c15aba2593c 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtNamedFunction.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtNamedFunction.java
@@ -20,7 +20,6 @@ import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiModifiableCodeBlock;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
@@ -35,7 +34,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class KtNamedFunction extends KtTypeParameterListOwnerStub<KotlinFunctionStub>
-        implements KtFunction, KtDeclarationWithInitializer, PsiModifiableCodeBlock {
+        implements KtFunction, KtDeclarationWithInitializer {
     public KtNamedFunction(@NotNull ASTNode node) {
         super(node);
     }
@@ -263,7 +262,7 @@ public class KtNamedFunction extends KtTypeParameterListOwnerStub<KotlinFunction
         return getParent() instanceof KtFile;
     }
 
-    @Override
+    @SuppressWarnings({"unused", "MethodMayBeStatic"}) //keep for compatibility with potential plugins
     public boolean shouldChangeModificationCount(PsiElement place) {
         // Suppress Java check for out-of-block
         return false;
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtProperty.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtProperty.java
index ead122eef79..1fd596f837f 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtProperty.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtProperty.java
@@ -21,11 +21,9 @@ import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiModifiableCodeBlock;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.AstLoadingFilter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.KtNodeTypes;
@@ -41,7 +39,7 @@ import static org.jetbrains.kotlin.KtNodeTypes.PROPERTY_DELEGATE;
 import static org.jetbrains.kotlin.lexer.KtTokens.EQ;
 
 public class KtProperty extends KtTypeParameterListOwnerStub<KotlinPropertyStub>
-        implements KtVariableDeclaration, PsiModifiableCodeBlock {
+        implements KtVariableDeclaration {
 
     private static final Logger LOG = Logger.getInstance(KtProperty.class);
 
@@ -345,7 +343,7 @@ public class KtProperty extends KtTypeParameterListOwnerStub<KotlinPropertyStub>
         return ItemPresentationProviders.getItemPresentation(this);
     }
 
-    @Override
+    @SuppressWarnings({"unused", "MethodMayBeStatic"}) //keep for compatibility with potential plugins
     public boolean shouldChangeModificationCount(PsiElement place) {
         // Suppress Java check for out-of-block
         return false;