diff --git a/java/debugger/shared/resources/intellij.java.debugger.impl.shared.xml b/java/debugger/shared/resources/intellij.java.debugger.impl.shared.xml
index 2083aa21b827..a111706a75ad 100644
--- a/java/debugger/shared/resources/intellij.java.debugger.impl.shared.xml
+++ b/java/debugger/shared/resources/intellij.java.debugger.impl.shared.xml
@@ -1,5 +1,4 @@
-<!--suppress PluginXmlValidity -->
-<idea-plugin package="com.intellij.java.debugger.impl.shared.fake">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceImplementation="com.intellij.debugger.settings.DebuggerSettings"/>
     <applicationSettings service="com.intellij.debugger.settings.DebuggerSettings"/>
diff --git a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/fake/placeholder.txt b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/fake/placeholder.txt
deleted file mode 100644
index 0a469b774357..000000000000
--- a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/fake/placeholder.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This file is added as a temporary workaround to have fake root package in intellij.java.debugger.impl.shared module.
-It can be removed when Java Frontend plugin is properly migrated to Plugin Model v2.
\ No newline at end of file
diff --git a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
index 55087be981e2..399904aead68 100644
--- a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
+++ b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.java.frontback.impl.fake">
+<idea-plugin>
   <module value="com.intellij.java.frontback.impl" />
   <extensionPoints>
     <!--suppress PluginXmlValidity -->
diff --git a/java/java-frontback-impl/src/com/intellij/java/frontback/impl/fake/placeholder.txt b/java/java-frontback-impl/src/com/intellij/java/frontback/impl/fake/placeholder.txt
deleted file mode 100644
index 81a1cc14ddb4..000000000000
--- a/java/java-frontback-impl/src/com/intellij/java/frontback/impl/fake/placeholder.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This file is added as a temporary workaround to have fake root package in intellij.java.frontback.impl module.
-It can be removed when Java Frontend plugin is properly migrated to Plugin Model v2.
\ No newline at end of file
diff --git a/java/java-frontback-psi-api/resources/intellij.java.frontback.psi.xml b/java/java-frontback-psi-api/resources/intellij.java.frontback.psi.xml
index fdb1228bd984..164f46cfcfb2 100644
--- a/java/java-frontback-psi-api/resources/intellij.java.frontback.psi.xml
+++ b/java/java-frontback-psi-api/resources/intellij.java.frontback.psi.xml
@@ -1,2 +1,2 @@
-<idea-plugin package="com.intellij.java.frontback.psi.fake">
+<idea-plugin>
 </idea-plugin>
diff --git a/java/java-frontback-psi-api/src/com/intellij/java/frontback/psi/fake/placeholder.txt b/java/java-frontback-psi-api/src/com/intellij/java/frontback/psi/fake/placeholder.txt
deleted file mode 100644
index a983bf67e7d2..000000000000
--- a/java/java-frontback-psi-api/src/com/intellij/java/frontback/psi/fake/placeholder.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This file is added as a temporary workaround to have fake root package in intellij.java.frontback.psi module.
-It can be removed when Java Frontend plugin is properly migrated to Plugin Model v2.
\ No newline at end of file
diff --git a/java/java-frontback-psi-impl/resources/intellij.java.frontback.psi.impl.xml b/java/java-frontback-psi-impl/resources/intellij.java.frontback.psi.impl.xml
index fee1838da140..f9a66090e330 100644
--- a/java/java-frontback-psi-impl/resources/intellij.java.frontback.psi.impl.xml
+++ b/java/java-frontback-psi-impl/resources/intellij.java.frontback.psi.impl.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.java.frontback.psi.impl.fake">
+<idea-plugin>
   <module value="com.intellij.java.frontback.psi.impl" />
   <extensions defaultExtensionNs="com.intellij">
     <!--suppress PluginXmlValidity -->
diff --git a/java/java-frontback-psi-impl/src/com/intellij/java/frontback/psi/impl/fake/placeholder.txt b/java/java-frontback-psi-impl/src/com/intellij/java/frontback/psi/impl/fake/placeholder.txt
deleted file mode 100644
index 6403a94fbb1a..000000000000
--- a/java/java-frontback-psi-impl/src/com/intellij/java/frontback/psi/impl/fake/placeholder.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This file is added as a temporary workaround to have fake root package in intellij.java.frontback.psi.impl module.
-It can be removed when Java Frontend plugin is properly migrated to Plugin Model v2.
\ No newline at end of file
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt
index d312bfcbb24f..eeb411f09d95 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt
@@ -6,7 +6,6 @@ import org.jetbrains.intellij.build.impl.PluginLayout
 
 object JavaPluginLayout {
   const val MAIN_MODULE_NAME = "intellij.java.plugin"
-  const val MAIN_FRONTEND_MODULE_NAME = "intellij.java.frontend"
 
   fun javaPlugin(addition: ((PluginLayout.PluginLayoutSpec) -> Unit)? = null): PluginLayout {
     return PluginLayout.plugin(mainModuleName = MAIN_MODULE_NAME, auto = true) { spec ->
@@ -107,19 +106,4 @@ object JavaPluginLayout {
       spec.excludeProjectLibrary("jetbrains-annotations-java5")
     }
   }
-
-  /**
-   * A special plugin for JetBrains Client
-   */
-  fun javaFrontendPlugin(): PluginLayout {
-    return PluginLayout.plugin(MAIN_FRONTEND_MODULE_NAME) { spec ->
-      @Suppress("SpellCheckingInspection")
-      spec.withModules(listOf(
-        "intellij.java.frontback.impl",
-        "intellij.java.frontback.psi",
-        "intellij.java.frontback.psi.impl",
-        "intellij.java.debugger.impl.shared",
-      ))
-    }
-  }
 }