diff --git a/idea/formatter/resources/messages/KotlinFormatterBundle.properties b/idea/formatter/resources/messages/KotlinFormatterBundle.properties
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinObsoleteCodeStyle.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinObsoleteCodeStyle.kt
index 98c85c8d7ee..b25c1e931a9 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinObsoleteCodeStyle.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinObsoleteCodeStyle.kt
@@ -9,7 +9,6 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
-import org.jetbrains.kotlin.idea.util.KotlinFormatterBundle
 
 class KotlinObsoleteCodeStyle : KotlinPredefinedCodeStyle(CODE_STYLE_TITLE, KotlinLanguage.INSTANCE) {
     override val codeStyleId: String = CODE_STYLE_ID
diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinStyleGuideCodeStyle.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinStyleGuideCodeStyle.kt
index 6282cbe555f..8685bde5788 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinStyleGuideCodeStyle.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinStyleGuideCodeStyle.kt
@@ -9,7 +9,6 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
-import org.jetbrains.kotlin.idea.util.KotlinFormatterBundle
 
 class KotlinStyleGuideCodeStyle : KotlinPredefinedCodeStyle("Kotlin style guide", KotlinLanguage.INSTANCE) {
     override val codeStyleId: String = CODE_STYLE_ID
diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/util/KotlinFormatterBundle.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/util/KotlinFormatterBundle.kt
deleted file mode 100644
index a44004e9f65..00000000000
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/util/KotlinFormatterBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.util
-
-import com.intellij.AbstractBundle
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-
-@NonNls
-private const val BUNDLE = "messages.KotlinFormatterBundle"
-
-object KotlinFormatterBundle : AbstractBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/ide-common/resources/messages/KotlinIdeCommonBundle.properties b/idea/ide-common/resources/messages/KotlinIdeCommonBundle.properties
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/util/KotlinIdeCommonBundle.kt b/idea/ide-common/src/org/jetbrains/kotlin/util/KotlinIdeCommonBundle.kt
deleted file mode 100644
index 503a0fccddd..00000000000
--- a/idea/ide-common/src/org/jetbrains/kotlin/util/KotlinIdeCommonBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.util
-
-import com.intellij.AbstractBundle
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-
-@NonNls
-private const val BUNDLE = "messages.KotlinIdeCommonBundle"
-
-object KotlinIdeCommonBundle : AbstractBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinIdeaCoreBundle.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinIdeaCoreBundle.kt
index 36189213c77..bfce29b3455 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinIdeaCoreBundle.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinIdeaCoreBundle.kt
@@ -5,14 +5,14 @@
 
 package org.jetbrains.kotlin.idea.core.util
 
-import com.intellij.AbstractBundle
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.annotations.PropertyKey
+import org.jetbrains.kotlin.util.AbstractKotlinBundle
 
 @NonNls
 private const val BUNDLE = "messages.KotlinIdeaCoreBundle"
 
-object KotlinIdeaCoreBundle : AbstractBundle(BUNDLE) {
+object KotlinIdeaCoreBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
     fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinIdeaGradleBundle.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinIdeaGradleBundle.kt
index a9a16b05085..8fcf7ca29f5 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinIdeaGradleBundle.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinIdeaGradleBundle.kt
@@ -5,14 +5,14 @@
 
 package org.jetbrains.kotlin.idea
 
-import com.intellij.AbstractBundle
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.annotations.PropertyKey
+import org.jetbrains.kotlin.util.AbstractKotlinBundle
 
 @NonNls
 private const val BUNDLE = "messages.KotlinIdeaGradleBundle"
 
-object KotlinIdeaGradleBundle : AbstractBundle(BUNDLE) {
+object KotlinIdeaGradleBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
     fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }