diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
index d0969df3e18..93bb5f02bca 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
@@ -98,7 +98,8 @@ class KotlinCleanupInspection : LocalInspectionTool(), CleanupLocalInspectionToo
             Errors.MISPLACED_TYPE_PARAMETER_CONSTRAINTS,
             Errors.COMMA_IN_WHEN_CONDITION_WITHOUT_ARGUMENT,
             ErrorsJs.WRONG_EXTERNAL_DECLARATION,
-            Errors.YIELD_IS_RESERVED
+            Errors.YIELD_IS_RESERVED,
+            Errors.DEPRECATED_MODIFIER_FOR_TARGET
     )
 
     private fun Diagnostic.isObsoleteLabel(): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceModifierFix.kt
index 69ddfc5fc3d..5a271096f06 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceModifierFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceModifierFix.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 class ReplaceModifierFix(
         element: KtModifierListOwner,
         private val modifier: KtModifierKeywordToken
-) : KotlinQuickFixAction<KtModifierListOwner>(element) {
+) : KotlinQuickFixAction<KtModifierListOwner>(element), CleanupFix {
 
     private val text = when (modifier) {
         KtTokens.HEADER_KEYWORD -> "Replace with 'expect'"
diff --git a/idea/testData/inspections/cleanup/cleanup.kt b/idea/testData/inspections/cleanup/cleanup.kt
index 908eba47d4c..caa21c05618 100644
--- a/idea/testData/inspections/cleanup/cleanup.kt
+++ b/idea/testData/inspections/cleanup/cleanup.kt
@@ -112,3 +112,7 @@ object X {
         yield::toInt
     }
 }
+
+header class Expected
+
+impl class Actual
diff --git a/idea/testData/inspections/cleanup/cleanup.kt.after b/idea/testData/inspections/cleanup/cleanup.kt.after
index 2524b1b6df5..378f5a40534 100644
--- a/idea/testData/inspections/cleanup/cleanup.kt.after
+++ b/idea/testData/inspections/cleanup/cleanup.kt.after
@@ -111,3 +111,7 @@ object X {
         `yield`::toInt
     }
 }
+
+expect class Expected
+
+actual class Actual