diff --git a/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java b/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java
index 1e4f5edd2beb..fb5a995ba555 100644
--- a/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java
+++ b/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java
@@ -77,9 +77,8 @@ public class DefaultSymbolNavigationContributor implements ChooseByNameContribut
 
   private static PsiMethod[] filterInheritedMethods(PsiMethod[] methods) {
     ArrayList<PsiMethod> list = new ArrayList<PsiMethod>(methods.length);
-    ProgressManager progressManager = ProgressManager.getInstance();
     for (PsiMethod method : methods) {
-      progressManager.checkCanceled();
+      ProgressManager.checkCanceled();
       if (method.isConstructor()) continue;
       PsiMethod[] supers = method.findSuperMethods();
       if (supers.length > 0) continue;
@@ -143,4 +142,4 @@ public class DefaultSymbolNavigationContributor implements ChooseByNameContribut
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
index 2ed8567329a6..170a9cdeb793 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
@@ -333,8 +333,7 @@ public class FileManagerImpl implements FileManager {
 
   @NotNull
   public GlobalSearchScope getResolveScope(@NotNull PsiElement element) {
-    final ProgressManager progressManager = ProgressManager.getInstance();
-    progressManager.checkCanceled();
+    ProgressManager.checkCanceled();
 
     VirtualFile vFile;
     final Project project = myManager.getProject();
@@ -383,10 +382,9 @@ public class FileManagerImpl implements FileManager {
       // resolve references in libraries in context of all modules which contain it
       List<Module> modulesLibraryUsedIn = new ArrayList<Module>();
       List<OrderEntry> orderEntries = projectFileIndex.getOrderEntriesForFile(vFile);
-      final ProgressManager progressManager = ProgressManager.getInstance();
 
       for (OrderEntry entry : orderEntries) {
-        progressManager.checkCanceled();
+        ProgressManager.checkCanceled();
 
         if (entry instanceof JdkOrderEntry) {
           return ((ProjectRootManagerEx)myProjectRootManager).getScopeForJdk((JdkOrderEntry)entry);
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/StaticMethodOnlyUsedInOneClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/StaticMethodOnlyUsedInOneClassInspection.java
index 8828b196363f..bdb20495e89f 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/StaticMethodOnlyUsedInOneClassInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/StaticMethodOnlyUsedInOneClassInspection.java
@@ -155,9 +155,7 @@ public class StaticMethodOnlyUsedInOneClassInspection
         private PsiClass usageClass = null;
 
         public boolean process(PsiReference reference) {
-            final ProgressManager progressManager =
-                    ProgressManager.getInstance();
-            progressManager.checkCanceled();
+            ProgressManager.checkCanceled();
             final PsiElement element = reference.getElement();
             final PsiClass usageClass =
                     ClassUtils.getContainingClass(element);
@@ -221,4 +219,4 @@ public class StaticMethodOnlyUsedInOneClassInspection
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java
index 5369f1e02568..e179a8ca8784 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java
@@ -20,7 +20,6 @@ import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.search.PsiElementProcessorAdapter;
-import com.intellij.psi.search.PsiSearchHelper;
 import com.intellij.psi.search.searches.ClassInheritorsSearch;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.siyeh.InspectionGadgetsBundle;
@@ -143,8 +142,6 @@ public class ObjectEqualityInspection extends BaseInspection {
 
         private boolean implementorsHaveOnlyPrivateConstructors(
                 final PsiClass aClass) {
-            final PsiManager manager = aClass.getManager();
-            final PsiSearchHelper searchHelper = manager.getSearchHelper();
             final GlobalSearchScope scope =
                     GlobalSearchScope.allScope(aClass.getProject());
             final PsiElementProcessor.CollectElementsWithLimit<PsiClass>
@@ -240,4 +237,4 @@ public class ObjectEqualityInspection extends BaseInspection {
 		            "java.lang.Number");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspection.java
index 7397e0d70b15..ca5d6b25af41 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspection.java
@@ -18,7 +18,6 @@ package com.siyeh.ig.inheritance;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.*;
-import com.intellij.psi.search.PsiSearchHelper;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.search.searches.ClassInheritorsSearch;
 import com.intellij.psi.util.MethodSignature;
@@ -151,8 +150,6 @@ public class AbstractMethodWithMissingImplementationsInspection
         }
 
         public void run() {
-            final PsiManager manager = aClass.getManager();
-            final PsiSearchHelper searchHelper = manager.getSearchHelper();
             final SearchScope searchScope = aClass.getUseScope();
           inheritors = ClassInheritorsSearch.search(aClass, searchScope, true)
                   .findAll();
@@ -166,4 +163,4 @@ public class AbstractMethodWithMissingImplementationsInspection
             return inheritors;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AbstractClassWithOnlyOneDirectInheritorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AbstractClassWithOnlyOneDirectInheritorInspection.java
index d438c764e88f..982a251b1321 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AbstractClassWithOnlyOneDirectInheritorInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AbstractClassWithOnlyOneDirectInheritorInspection.java
@@ -17,12 +17,10 @@ package com.siyeh.ig.j2me;
 
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiModifier;
 import com.intellij.psi.PsiTypeParameter;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.search.PsiElementProcessorAdapter;
-import com.intellij.psi.search.PsiSearchHelper;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.search.searches.ClassInheritorsSearch;
 import com.siyeh.InspectionGadgetsBundle;
@@ -73,8 +71,6 @@ public class AbstractClassWithOnlyOneDirectInheritorInspection
         }
 
         private static boolean hasOneInheritor(final PsiClass aClass) {
-            final PsiManager manager = aClass.getManager();
-            final PsiSearchHelper searchHelper = manager.getSearchHelper();
             final SearchScope searchScope = aClass.getUseScope();
             final PsiElementProcessor.CollectElementsWithLimit<PsiClass> processor =
                     new PsiElementProcessor.CollectElementsWithLimit<PsiClass>(2);
@@ -88,4 +84,4 @@ public class AbstractClassWithOnlyOneDirectInheritorInspection
             return collection.size() == 1;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/InterfaceWithOnlyOneDirectInheritorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/InterfaceWithOnlyOneDirectInheritorInspection.java
index d5352dacaf81..00b0c57e7f0a 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/InterfaceWithOnlyOneDirectInheritorInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/InterfaceWithOnlyOneDirectInheritorInspection.java
@@ -17,10 +17,8 @@ package com.siyeh.ig.j2me;
 
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiManager;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.search.PsiElementProcessorAdapter;
-import com.intellij.psi.search.PsiSearchHelper;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.search.searches.ClassInheritorsSearch;
 import com.siyeh.InspectionGadgetsBundle;
@@ -64,8 +62,6 @@ public class InterfaceWithOnlyOneDirectInheritorInspection
         }
 
         private static boolean hasOneInheritor(final PsiClass aClass) {
-            final PsiManager manager = aClass.getManager();
-            final PsiSearchHelper searchHelper = manager.getSearchHelper();
             final SearchScope searchScope = aClass.getUseScope();
             final PsiElementProcessor.CollectElementsWithLimit<PsiClass> processor =
                     new PsiElementProcessor.CollectElementsWithLimit<PsiClass>(2);
@@ -79,4 +75,4 @@ public class InterfaceWithOnlyOneDirectInheritorInspection
             return collection.size() == 1;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTypeDefImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTypeDefImpl.java
index 133fb574d1bb..6a5282fd9be0 100644
--- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTypeDefImpl.java
+++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTypeDefImpl.java
@@ -521,9 +521,8 @@ public class AntTypeDefImpl extends AntTaskImpl implements AntTypeDef {
     final List<File> files = new ArrayList<File>();
     final HashSet<AntFilesProvider> processed = new HashSet<AntFilesProvider>(); // aux collection 
     // check 'classpathref'
-    final ProgressManager progressManager = ProgressManager.getInstance();
     for (PsiReference reference : getReferences()) {
-      progressManager.checkCanceled();
+      ProgressManager.checkCanceled();
       if (reference instanceof AntRefIdReference) {
         final PsiElement resolved = reference.resolve();
         if (resolved instanceof AntFilesProvider) {
@@ -533,7 +532,7 @@ public class AntTypeDefImpl extends AntTaskImpl implements AntTypeDef {
     }
     // check nested elements
     for (AntElement antElement : getChildren()) {
-      progressManager.checkCanceled();
+      ProgressManager.checkCanceled();
       if (antElement instanceof AntFilesProvider) {
         files.addAll(((AntFilesProvider)antElement).getFiles(processed));
       }
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java
index 34bd746a4616..78a85b15646b 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java
@@ -188,14 +188,6 @@ public class CvsOperationExecutor {
     }
   }
 
-  private static void setCancelText(final CvsHandler handler) {
-    ProgressManager progressManager = ProgressManager.getInstance();
-    String cancelButtonText = handler.getCancelButtonText();
-    if (cancelButtonText != null) {
-      progressManager.setCancelButtonText(cancelButtonText);
-    }
-  }
-
   private boolean doNotShowProgress() {
     return isInProgress() || isInTestMode() || !myShowProgress || !ApplicationManager.getApplication().isDispatchThread();
   }
diff --git a/xml/impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java b/xml/impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java
index 7f51b32fbe99..ac701b668dcf 100644
--- a/xml/impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java
+++ b/xml/impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java
@@ -58,10 +58,8 @@ public class CheckDtdReferencesInspection extends XmlSuppressableInspectionTool
   }
 
   private static void doCheckRefs(final XmlElement element, final ProblemsHolder holder) {
-    final ProgressManager progressManager = ProgressManager.getInstance();
-
     for(PsiReference ref:element.getReferences()) {
-      progressManager.checkCanceled();
+      ProgressManager.checkCanceled();
       if (XmlHighlightVisitor.hasBadResolve(ref)) {
         if (ref.getElement() instanceof XmlElementContentSpec) {
           final String image = ref.getCanonicalText();
@@ -178,4 +176,4 @@ public class CheckDtdReferencesInspection extends XmlSuppressableInspectionTool
       templateManager.startTemplate(editor, t);
     }
   }
-}
\ No newline at end of file
+}