diff --git a/.idea/libraries/delight_rhino_sandbox.xml b/.idea/libraries/delight_rhino_sandbox.xml
deleted file mode 100644
index b8b4f98d8bd7..000000000000
--- a/.idea/libraries/delight_rhino_sandbox.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<component name="libraryTable">
-  <library name="delight-rhino-sandbox" type="repository">
-    <properties maven-id="org.javadelight:delight-rhino-sandbox:0.0.11">
-      <exclude>
-        <dependency maven-id="org.mozilla:rhino" />
-        <dependency maven-id="com.google.guava:guava" />
-      </exclude>
-    </properties>
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javadelight/delight-rhino-sandbox/0.0.11/delight-rhino-sandbox-0.0.11.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/xtend/org.eclipse.xtend.lib/2.17.0/org.eclipse.xtend.lib-2.17.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/xtext/org.eclipse.xtext.xbase.lib/2.17.0/org.eclipse.xtext.xbase.lib-2.17.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/xtend/org.eclipse.xtend.lib.macro/2.17.0/org.eclipse.xtend.lib.macro-2.17.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/proxy_vole.xml b/.idea/libraries/proxy_vole.xml
index afaddda93f79..e3d670ba36f7 100644
--- a/.idea/libraries/proxy_vole.xml
+++ b/.idea/libraries/proxy_vole.xml
@@ -1,12 +1,23 @@
 <component name="libraryTable">
   <library name="proxy-vole" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:proxy-vole:1.0.5-jb.2" />
+    <properties maven-id="org.bidib.com.github.markusbernhardt:proxy-vole:1.0.10">
+      <exclude>
+        <dependency maven-id="net.java.dev.jna:jna" />
+        <dependency maven-id="net.java.dev.jna:jna-platform" />
+        <dependency maven-id="org.ini4j:ini4j" />
+        <dependency maven-id="org.mozilla:rhino-runtime" />
+        <dependency maven-id="com.google.guava:guava" />
+        <dependency maven-id="org.slf4j:slf4j-api" />
+      </exclude>
+    </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/proxy-vole/1.0.5-jb.2/proxy-vole-1.0.5-jb.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/bidib/com/github/markusbernhardt/proxy-vole/1.0.10/proxy-vole-1.0.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/javadelight/delight-rhino-sandbox/0.0.11/delight-rhino-sandbox-0.0.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/xtend/org.eclipse.xtend.lib/2.17.0/org.eclipse.xtend.lib-2.17.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/xtext/org.eclipse.xtext.xbase.lib/2.17.0/org.eclipse.xtext.xbase.lib-2.17.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/xtend/org.eclipse.xtend.lib.macro/2.17.0/org.eclipse.xtend.lib.macro-2.17.0.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/proxy-vole/1.0.5-jb.2/proxy-vole-1.0.5-jb.2-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/rhino.xml b/.idea/libraries/rhino.xml
index b8a13cc37433..7da94efa2d89 100644
--- a/.idea/libraries/rhino.xml
+++ b/.idea/libraries/rhino.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="rhino" type="repository">
-    <properties maven-id="org.mozilla:rhino:1.7.13" />
+    <properties maven-id="org.mozilla:rhino-runtime:1.7.13" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mozilla/rhino/1.7.13/rhino-1.7.13.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mozilla/rhino-runtime/1.7.13/rhino-runtime-1.7.13.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mozilla/rhino/1.7.13/rhino-1.7.13-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mozilla/rhino-runtime/1.7.13/rhino-runtime-1.7.13-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index de9e5fb49fcd..1e1d08d62d45 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -245,9 +245,6 @@ class CommunityLibraryLicenses {
                        url: "https://github.com/dart-lang/vm_service_drivers",
                        version: LibraryLicense.CUSTOM_REVISION),
     new LibraryLicense(name: "dbus-java", libraryName: "dbus-java", license: "LGPL", url: "https://mvnrepository.com/artifact/com.github.hypfvieh/dbus-java"),
-    new LibraryLicense(name: "delight-rhino-sandbox", libraryName: "delight-rhino-sandbox", license: "Apache 2.0",
-                       url: "https://github.com/javadelight/delight-rhino-sandbox",
-                       licenseUrl: "https://github.com/javadelight/delight-rhino-sandbox/blob/master/LICENSE.TXT"),
     new LibraryLicense(name: "directory-watcher", libraryName: "directory-watcher", license: "Apache 2.0", url: "https://github.com/gmethvin/directory-watcher/"),
     new LibraryLicense(name: "docutils", attachedTo: "intellij.python.helpers", version: "0.8", license: "BSD",
                        url: "http://docutils.sourceforge.net/"),
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.groovy
index 3040020f2f86..3bc0cf9ea587 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.groovy
@@ -53,7 +53,7 @@ class BaseLayoutSpec {
    * @relativeOutputPath path relative to 'lib' plugin directory
    */
   void withProjectLibrary(String libraryName, String relativeOutputPath = "") {
-    layout.includedProjectLibraries << new ProjectLibraryData(libraryName, relativeOutputPath)
+    layout.includedProjectLibraries.add(new ProjectLibraryData(libraryName, relativeOutputPath))
   }
 
   /**
@@ -63,8 +63,8 @@ class BaseLayoutSpec {
    * @param relativeOutputPath target path relative to 'lib' directory
    */
   void withModuleLibrary(String libraryName, String moduleName, String relativeOutputPath) {
-    layout.includedModuleLibraries << new ModuleLibraryData(moduleName: moduleName, libraryName: libraryName,
-                                                            relativeOutputPath: relativeOutputPath)
+    layout.includedModuleLibraries.add(new ModuleLibraryData(moduleName: moduleName, libraryName: libraryName,
+                                                            relativeOutputPath: relativeOutputPath))
   }
 
   /**
@@ -87,7 +87,7 @@ class BaseLayoutSpec {
 
   /**
    * Include an artifact output to the plugin distribution.
-   * @param artifactName name of the project configuration  
+   * @param artifactName name of the project configuration
    * @param relativeOutputPath target path relative to 'lib' directory
    */
   void withArtifact(String artifactName, String relativeOutputPath) {
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.groovy
index 2489d3d6c75f..e2271dde00f7 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.groovy
@@ -1,4 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.intellij.build.impl
 
 import groovy.transform.CompileStatic
diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml
index 5c95b45e8db3..6d8bdba5b218 100644
--- a/platform/platform-api/intellij.platform.ide.iml
+++ b/platform/platform-api/intellij.platform.ide.iml
@@ -32,7 +32,6 @@
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="netty-codec-http" level="project" />
     <orderEntry type="library" name="Java Compatibility" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="delight-rhino-sandbox" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="rhino" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="netty-handler-proxy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" exported="" />