diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt
index 0d07ae9afae..c3e98346630 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt
@@ -5,9 +5,9 @@
 
 package org.jetbrains.kotlin.idea.formatter
 
+import com.intellij.application.options.CodeStyle
 import com.intellij.openapi.project.Project
 import com.intellij.psi.codeStyle.CodeStyleSettings
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 
@@ -31,8 +31,7 @@ fun KtCodeStyleSettings.restore() {
 }
 
 fun ktCodeStyleSettings(project: Project): KtCodeStyleSettings? {
-    @Suppress("DEPRECATION") // Suggested update is not supported in 173. BUNCH: 173
-    val settings = CodeStyleSettingsManager.getSettings(project)
+    val settings = CodeStyle.getSettings(project)
 
     val ktCommonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE) as KotlinCommonCodeStyleSettings
     val ktCustomSettings = settings.getCustomSettings(KotlinCodeStyleSettings::class.java)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
index df855b74132..4ddf811d240 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
@@ -132,16 +132,9 @@ public class IdeStubIndexService extends StubIndexService {
         }
     }
 
-    // Drop suppression and fix warning after abandoning 173 branch
-    // BUNCH: 173
-    @SuppressWarnings({"ConstantConditions", "CastCanBeRemovedNarrowingVariableType"})
     @Nullable
     private static KotlinModifierListStub getModifierListStub(@NotNull KotlinClassOrObjectStub<? extends KtClassOrObject> stub) {
-        StubElement<?> childStub = stub.findChildStubByType(KtStubElementTypes.MODIFIER_LIST);
-        if (!(childStub instanceof KotlinModifierListStub)) {
-            return null;
-        }
-        return (KotlinModifierListStub) childStub;
+        return stub.findChildStubByType(KtStubElementTypes.MODIFIER_LIST);
     }
 
     @Override
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt
index 58dba53b9e3..1fc80d7f865 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt
@@ -22,7 +22,6 @@ private const val KOTLIN_UPDATE_CODE_STYLE_PROPERTY_NAME = "update.kotlin.code.s
 fun notifyKotlinStyleUpdateIfNeeded(project: Project) {
     if (!isDefaultOfficialCodeStyle) return
 
-    @Suppress("DEPRECATION") // Suggested fix is absent in 173. BUNCH: 173
     val isProjectSettings = CodeStyleSettingsManager.getInstance(project).USE_PER_PROJECT_SETTINGS
     val settingsComponent: PropertiesComponent = if (isProjectSettings) {
         PropertiesComponent.getInstance(project)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java
index 764d2c93207..714328f16ae 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java
@@ -102,8 +102,7 @@ public class MockUpdateParameterInfoContext implements UpdateParameterInfoContex
         return false;
     }
 
-    //@Override since 181
-    //add `@Override` when BUNCH: 173 is dropped
+    @Override
     public UserDataHolderEx getCustomContext() {
         return null;
     }