diff --git a/build/scripts/common_tests.gant b/build/scripts/common_tests.gant
index 855ba9bc7e9e..a6778a2b3113 100644
--- a/build/scripts/common_tests.gant
+++ b/build/scripts/common_tests.gant
@@ -36,7 +36,6 @@ target(compile: "Compile project") {
   }
 
   if (!isDefined("avoid.project.rebuild")) {
-    clearBuildCaches()
     projectBuilder.cleanOutput()
     projectBuilder.buildAll()
   }
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 4af419a50fc3..2ba90aaafb99 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -204,15 +204,6 @@ binding.setVariable("prepareOutputFolder", {
   }
 })
 
-binding.setVariable("clearBuildCaches", {
-  //todo[nik] this is temporary solution until we update bootstrap jps-builders jars to the new version where cleaning is performed in JpsGantProjectBuilder#cleanOutput
-  if (projectBuilder.buildIncrementally && !Boolean.parseBoolean(p("jps.build.clear.incremental.caches", "false"))) return 
-  def storageRoot = projectBuilder.dataStorageRoot
-  if (storageRoot != null) {
-    FileUtil.delete(storageRoot)
-  }
-})
-
 binding.setVariable("findModule", {String name ->
   project.modules.find { it.name == name }
 })
@@ -350,7 +341,6 @@ binding.setVariable("buildModulesAndCollectUsedJars", { List modules, List appro
   def modulesToBuild = []
   def modulesNames = modules.contains(javaRT) ? modules : [*modules, javaRT]
   def usedJars = collectUsedJars(modulesNames, approvedJars, forbiddenJars, modulesToBuild)
-  clearBuildCaches()
   projectBuilder.cleanOutput()
   projectBuilder.buildModules(modulesToBuild)