diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java
index 1bf80911e040..74ed9e1ae075 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java
@@ -17,7 +17,6 @@ package com.intellij.compiler.options;
 
 import com.intellij.compiler.CompilerConfiguration;
 import com.intellij.compiler.CompilerConfigurationImpl;
-import com.intellij.compiler.server.BuildManager;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
@@ -93,11 +92,6 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable,
     final CompilerConfigurationImpl config = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject);
     config.setDefaultProcessorProfile(myMainPanel.getDefaultProfile());
     config.setModuleProcessorProfiles(myMainPanel.getModuleProfiles());
-    SwingUtilities.invokeLater(new Runnable() {
-      public void run() {
-        BuildManager.getInstance().clearState(myProject);
-      }
-    });
   }
 
   public void reset() {
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
index f7a778767a1e..ee2a2003058a 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
@@ -133,12 +133,6 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
     final TranslatingCompilerFilesMonitor monitor = TranslatingCompilerFilesMonitor.getInstance();
     if (workspaceConfiguration.USE_COMPILE_SERVER) {
       monitor.suspendProject(myProject);
-      //noinspection SSBasedInspection
-      SwingUtilities.invokeLater(new Runnable() {
-        public void run() {
-          BuildManager.getInstance().clearState(myProject);
-        }
-      });
     }
     else {
       // use old make
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java
index c7f4d35808d4..09adabaa075b 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java
@@ -18,7 +18,6 @@ package com.intellij.compiler.options;
 import com.intellij.compiler.CompilerConfiguration;
 import com.intellij.compiler.CompilerConfigurationImpl;
 import com.intellij.compiler.impl.javaCompiler.BackendCompiler;
-import com.intellij.compiler.server.BuildManager;
 import com.intellij.openapi.compiler.CompilerBundle;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
@@ -144,12 +143,6 @@ public class JavaCompilersTab implements SearchableConfigurable, Configurable.No
 
     myTargetLevelComponent.setProjectBytecodeTargetLevel(myCompilerConfiguration.getProjectBytecodeTarget());
     myTargetLevelComponent.setModuleTargetLevels(myCompilerConfiguration.getModulesBytecodeTargetMap());
-
-    SwingUtilities.invokeLater(new Runnable() {
-      public void run() {
-        BuildManager.getInstance().clearState(myProject);
-      }
-    });
   }
 
   public void reset() {