diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java
index aabed8b188e7..990b6d7791b6 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 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-2019 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 com.intellij.psi.impl;
 
 import com.intellij.openapi.application.ReadActionProcessor;
@@ -21,13 +21,16 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
-/**
- * @author kosyakov
- */
-public class PsiElementFinderImpl extends PsiElementFinder implements DumbAware {
+public final class PsiElementFinderImpl extends PsiElementFinder implements DumbAware {
   private final Project myProject;
   private final JavaFileManager myFileManager;
 
+  public PsiElementFinderImpl(Project project) {
+    myProject = project;
+    myFileManager = JavaFileManager.getInstance(project);
+  }
+
+  @Deprecated
   public PsiElementFinderImpl(Project project, JavaFileManager javaFileManager) {
     myProject = project;
     myFileManager = javaFileManager;
diff --git a/plugins/gradle/java/src/service/project/wizard/GradleProjectImportBuilder.java b/plugins/gradle/java/src/service/project/wizard/GradleProjectImportBuilder.java
index 2b4d1e3e68df..fd403bd632cb 100644
--- a/plugins/gradle/java/src/service/project/wizard/GradleProjectImportBuilder.java
+++ b/plugins/gradle/java/src/service/project/wizard/GradleProjectImportBuilder.java
@@ -44,7 +44,11 @@ import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-public class GradleProjectImportBuilder extends AbstractExternalProjectImportBuilder<ImportFromGradleControl> {
+public final class GradleProjectImportBuilder extends AbstractExternalProjectImportBuilder<ImportFromGradleControl> {
+  public GradleProjectImportBuilder() {
+    this(ProjectDataManager.getInstance());
+  }
+
   /**
    * @deprecated use {@link GradleProjectImportBuilder#GradleProjectImportBuilder(ProjectDataManager)}
    */
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectModelModifier.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectModelModifier.java
index 768a1fa1a7a5..493495ef37c0 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectModelModifier.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectModelModifier.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 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-2019 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.idea.maven.importing;
 
 import com.intellij.openapi.command.WriteCommandAction;
@@ -41,15 +41,15 @@ import java.util.*;
 /**
  * @author nik
  */
-public class MavenProjectModelModifier extends JavaProjectModelModifier {
+public final class MavenProjectModelModifier extends JavaProjectModelModifier {
   private final Project myProject;
   private final MavenProjectsManager myProjectsManager;
   private final MavenProjectIndicesManager myIndicesManager;
 
-  public MavenProjectModelModifier(Project project, MavenProjectsManager projectsManager, MavenProjectIndicesManager manager) {
+  public MavenProjectModelModifier(Project project) {
     myProject = project;
-    myProjectsManager = projectsManager;
-    myIndicesManager = manager;
+    myProjectsManager = MavenProjectsManager.getInstance(project);
+    myIndicesManager = MavenProjectIndicesManager.getInstance(project);
   }
 
   @Nullable
diff --git a/uast/uast-tests/src/org/jetbrains/uast/test/env/TestCoreEnvironment.java b/uast/uast-tests/src/org/jetbrains/uast/test/env/TestCoreEnvironment.java
index f92e6a62904c..0ae045c85806 100644
--- a/uast/uast-tests/src/org/jetbrains/uast/test/env/TestCoreEnvironment.java
+++ b/uast/uast-tests/src/org/jetbrains/uast/test/env/TestCoreEnvironment.java
@@ -196,7 +196,7 @@ public class TestCoreEnvironment extends AbstractCoreEnvironment {
 
       //noinspection TestOnlyProblems
       PsiElementFinder.EP
-        .getPoint(null).registerExtension(new PsiElementFinderImpl(myProject, ServiceManager.getService(myProject, JavaFileManager.class)), mDisposable);
+        .getPoint(null).registerExtension(new PsiElementFinderImpl(myProject), mDisposable);
     }
   }
 }