diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
index 40d66df8dc1..2c8c347682e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
@@ -61,8 +61,6 @@ public class KotlinCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
                         addBlankLinesTab(settings);
                         addTab(new ImportSettingsPanelWrapper(settings));
 
-                        // BUNCH: 182
-                        //noinspection IncompatibleAPI
                         for (CodeStyleSettingsProvider provider : CodeStyleSettingsProvider.EXTENSION_POINT_NAME.getExtensions()) {
                             if (provider.getLanguage() == KotlinLanguage.INSTANCE && !provider.hasSettingsPage()) {
                                 createTab(provider);
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt
index 0bf410e987f..189cd7a4fd7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension
 import javax.swing.Icon
 
-// BUNCH: 182
 // BUNCH: as35
 // BUNCH: as34
 // BUNCH: 191
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.192 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.192
index 99715aec23a..02dd025c745 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.192
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.192
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension
 import javax.swing.Icon
 
-// BUNCH: 182
 // BUNCH: as35
 // BUNCH: as34
 internal fun createDslStyleIcon(styleId: Int): Icon {
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as34 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as34
index 6ffa7ad695f..c1ae1f2d614 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as34
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as34
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.highlighter.markers
 import com.intellij.icons.AllIcons
 import javax.swing.Icon
 
-// BUNCH: 182
 // BUNCH: as35
 // BUNCH: as34
 internal fun createDslStyleIcon(styleId: Int): Icon {
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35
index 6ffa7ad695f..c1ae1f2d614 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.highlighter.markers
 import com.intellij.icons.AllIcons
 import javax.swing.Icon
 
-// BUNCH: 182
 // BUNCH: as35
 // BUNCH: as34
 internal fun createDslStyleIcon(styleId: Int): Icon {
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36
index 6ffa7ad695f..c1ae1f2d614 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.highlighter.markers
 import com.intellij.icons.AllIcons
 import javax.swing.Icon
 
-// BUNCH: 182
 // BUNCH: as35
 // BUNCH: as34
 internal fun createDslStyleIcon(styleId: Int): Icon {
diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/AndroidExtensionsReferenceSearchExecutor.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/AndroidExtensionsReferenceSearchExecutor.kt
index bb256a28a0f..4adb66fd699 100644
--- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/AndroidExtensionsReferenceSearchExecutor.kt
+++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/AndroidExtensionsReferenceSearchExecutor.kt
@@ -37,7 +37,6 @@ class AndroidExtensionsReferenceSearchExecutor : QueryExecutorBase<PsiReference,
     override fun processQuery(queryParameters: ReferencesSearch.SearchParameters, consumer: Processor<in PsiReference>) {
         val elementToSearch = queryParameters.elementToSearch as? XmlAttributeValue ?: return
         val scopeElements = (queryParameters.effectiveSearchScope as? LocalSearchScope)?.scope ?: return
-        @Suppress("UNNECESSARY_SAFE_CALL", "USELESS_ELVIS") // BUNCH: 182
         val referenceName = elementToSearch.value?.substringAfterLast("/") ?: return
 
         scopeElements.filterIsInstance<KtElement>().forEach {
diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
index 851e00e8b03..78857656b01 100644
--- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
+++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
@@ -51,7 +51,6 @@ class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension {
         return null
     }
 
-    @Suppress("UNNECESSARY_SAFE_CALL", "USELESS_ELVIS") // BUNCH: 182
     private fun isIdDeclaration(declaration: XmlAttributeValue) = declaration.value?.startsWith("@+id/") ?: false
 
     private fun KtSimpleNameReference.isReferenceToXmlFile(xmlFile: XmlFile): Boolean {