diff --git a/.idea/modules.xml b/.idea/modules.xml
index ebe1d7b8590e..16a4b30e3a55 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -555,7 +555,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/jsonpath/intellij.jsonpath.iml" filepath="$PROJECT_DIR$/plugins/jsonpath/intellij.jsonpath.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/jsp-openapi/intellij.jsp.iml" filepath="$PROJECT_DIR$/java/jsp-openapi/intellij.jsp.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/jsp-base-openapi/intellij.jsp.base.iml" filepath="$PROJECT_DIR$/java/jsp-base-openapi/intellij.jsp.base.iml" />
-      <module fileurl="file://$PROJECT_DIR$/java/jsp-openapi-no-deps/intellij.jsp.noDeps.iml" filepath="$PROJECT_DIR$/java/jsp-openapi-no-deps/intellij.jsp.noDeps.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/jsp-spi/intellij.jsp.spi.iml" filepath="$PROJECT_DIR$/java/jsp-spi/intellij.jsp.spi.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/junit/intellij.junit.iml" filepath="$PROJECT_DIR$/plugins/junit/intellij.junit.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml" filepath="$PROJECT_DIR$/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml" />
diff --git a/java/java-frontback-impl/intellij.java.frontback.impl.iml b/java/java-frontback-impl/intellij.java.frontback.impl.iml
index a6de23ba2c28..48893dcec25e 100644
--- a/java/java-frontback-impl/intellij.java.frontback.impl.iml
+++ b/java/java-frontback-impl/intellij.java.frontback.impl.iml
@@ -24,6 +24,5 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.threadDumpParser" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
-    <orderEntry type="module" module-name="intellij.jsp.noDeps" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/jsp-base-openapi/intellij.jsp.base.iml b/java/jsp-base-openapi/intellij.jsp.base.iml
index f8db2790686e..f44049b5f4f9 100644
--- a/java/jsp-base-openapi/intellij.jsp.base.iml
+++ b/java/jsp-base-openapi/intellij.jsp.base.iml
@@ -10,6 +10,5 @@
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.xml" exported="" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.jsp.noDeps" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/jsp-openapi-no-deps/BUILD.bazel b/java/jsp-openapi-no-deps/BUILD.bazel
deleted file mode 100644
index de471ac01478..000000000000
--- a/java/jsp-openapi-no-deps/BUILD.bazel
+++ /dev/null
@@ -1,18 +0,0 @@
-### auto-generated section `build intellij.jsp.noDeps` start
-load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
-
-jvm_resources(
-  name = "jsp-noDeps_resources",
-  files = glob(["resources/**/*"]),
-  strip_prefix = "resources"
-)
-
-jvm_library(
-  name = "jsp-noDeps",
-  module_name = "intellij.jsp.noDeps",
-  visibility = ["//visibility:public"],
-  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
-  deps = ["@lib//:jetbrains-annotations"],
-  runtime_deps = [":jsp-noDeps_resources"]
-)
-### auto-generated section `build intellij.jsp.noDeps` end
\ No newline at end of file
diff --git a/java/jsp-openapi-no-deps/intellij.jsp.noDeps.iml b/java/jsp-openapi-no-deps/intellij.jsp.noDeps.iml
deleted file mode 100644
index 4894b211113a..000000000000
--- a/java/jsp-openapi-no-deps/intellij.jsp.noDeps.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jetbrains-annotations" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/java/jsp-openapi-no-deps/resources/intellij.jsp.noDeps.xml b/java/jsp-openapi-no-deps/resources/intellij.jsp.noDeps.xml
deleted file mode 100644
index 164f46cfcfb2..000000000000
--- a/java/jsp-openapi-no-deps/resources/intellij.jsp.noDeps.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<idea-plugin>
-</idea-plugin>
diff --git a/java/jsp-openapi/intellij.jsp.iml b/java/jsp-openapi/intellij.jsp.iml
index a5a63194d7ec..d3b8c49ce1b3 100644
--- a/java/jsp-openapi/intellij.jsp.iml
+++ b/java/jsp-openapi/intellij.jsp.iml
@@ -10,6 +10,5 @@
     <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.jsp.base" exported="" />
-    <orderEntry type="module" module-name="intellij.jsp.noDeps" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
index 2d97248d4fdb..3994923bfd64 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
@@ -130,7 +130,6 @@ abstract class BaseIdeaProperties : JetBrainsProductProperties() {
 
       if (!productLayout.productApiModules.contains("intellij.jsp.base")) {
         layout.withModule("intellij.jsp.base")
-        layout.withModule("intellij.jsp.noDeps", "app-client.jar")
       }
 
       for (moduleName in arrayOf(
diff --git a/platform/core-api/api-dump-unreviewed.txt b/platform/core-api/api-dump-unreviewed.txt
index 1bfcbcb50867..9f1cb19b8f9f 100644
--- a/platform/core-api/api-dump-unreviewed.txt
+++ b/platform/core-api/api-dump-unreviewed.txt
@@ -4521,6 +4521,13 @@ a:com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry
 - s:getReferencesFromProviders(com.intellij.psi.PsiElement):com.intellij.psi.PsiReference[]
 - s:getReferencesFromProviders(com.intellij.psi.PsiElement,com.intellij.psi.PsiReferenceService$Hints):com.intellij.psi.PsiReference[]
 - a:getRegistrar(com.intellij.lang.Language):com.intellij.psi.PsiReferenceRegistrar
+com.intellij.psi.jsp.IJspClassLevelDeclarationStatement
+com.intellij.psi.jsp.JspClassLevelDeclarationStatementType
+com.intellij.psi.jsp.JspCodeBlockType
+com.intellij.psi.jsp.JspCommentType
+com.intellij.psi.jsp.JspJavaCodeType
+com.intellij.psi.jsp.JspScriptletType
+com.intellij.psi.jsp.JspTemplateExpressionType
 com.intellij.psi.meta.MetaDataContributor
 - a:contributeMetaData(com.intellij.psi.meta.MetaDataRegistrar):V
 a:com.intellij.psi.meta.MetaDataRegistrar
diff --git a/java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/IJspClassLevelDeclarationStatement.java b/platform/core-api/src/com/intellij/psi/jsp/IJspClassLevelDeclarationStatement.java
similarity index 100%
rename from java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/IJspClassLevelDeclarationStatement.java
rename to platform/core-api/src/com/intellij/psi/jsp/IJspClassLevelDeclarationStatement.java
diff --git a/java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/IJspCodeBlock.java b/platform/core-api/src/com/intellij/psi/jsp/IJspCodeBlock.java
similarity index 100%
rename from java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/IJspCodeBlock.java
rename to platform/core-api/src/com/intellij/psi/jsp/IJspCodeBlock.java
diff --git a/java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/IJspJavaComment.java b/platform/core-api/src/com/intellij/psi/jsp/IJspJavaComment.java
similarity index 100%
rename from java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/IJspJavaComment.java
rename to platform/core-api/src/com/intellij/psi/jsp/IJspJavaComment.java
diff --git a/java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspClassLevelDeclarationStatementType.java b/platform/core-api/src/com/intellij/psi/jsp/JspClassLevelDeclarationStatementType.java
similarity index 100%
rename from java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspClassLevelDeclarationStatementType.java
rename to platform/core-api/src/com/intellij/psi/jsp/JspClassLevelDeclarationStatementType.java
diff --git a/java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspCodeBlockType.java b/platform/core-api/src/com/intellij/psi/jsp/JspCodeBlockType.java
similarity index 100%
rename from java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspCodeBlockType.java
rename to platform/core-api/src/com/intellij/psi/jsp/JspCodeBlockType.java
diff --git a/java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspCommentType.java b/platform/core-api/src/com/intellij/psi/jsp/JspCommentType.java
similarity index 100%
rename from java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspCommentType.java
rename to platform/core-api/src/com/intellij/psi/jsp/JspCommentType.java
diff --git a/java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspJavaCodeType.java b/platform/core-api/src/com/intellij/psi/jsp/JspJavaCodeType.java
similarity index 100%
rename from java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspJavaCodeType.java
rename to platform/core-api/src/com/intellij/psi/jsp/JspJavaCodeType.java
diff --git a/java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspScriptletType.java b/platform/core-api/src/com/intellij/psi/jsp/JspScriptletType.java
similarity index 100%
rename from java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspScriptletType.java
rename to platform/core-api/src/com/intellij/psi/jsp/JspScriptletType.java
diff --git a/java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspTemplateExpressionType.java b/platform/core-api/src/com/intellij/psi/jsp/JspTemplateExpressionType.java
similarity index 100%
rename from java/jsp-openapi-no-deps/src/com/intellij/psi/jsp/JspTemplateExpressionType.java
rename to platform/core-api/src/com/intellij/psi/jsp/JspTemplateExpressionType.java