diff --git a/ide/editor/src/org/netbeans/modules/editor/resources/layer.xml b/ide/editor/src/org/netbeans/modules/editor/resources/layer.xml
index bb1f59af7672..6c905f6814d2 100644
--- a/ide/editor/src/org/netbeans/modules/editor/resources/layer.xml
+++ b/ide/editor/src/org/netbeans/modules/editor/resources/layer.xml
@@ -352,8 +352,9 @@
             </folder>    
         </folder>
     </folder>
-    
+    <!-- disabled
     <folder name="WarmUp">
       <file name="org-netbeans-modules-editor-EditorWarmUpTask.instance"/>
     </folder>
+    -->
 </filesystem>
diff --git a/ide/refactoring.api/src/org/netbeans/modules/refactoring/api/resources/layer.xml b/ide/refactoring.api/src/org/netbeans/modules/refactoring/api/resources/layer.xml
index bfd7e69ea4f1..20e057aafa89 100644
--- a/ide/refactoring.api/src/org/netbeans/modules/refactoring/api/resources/layer.xml
+++ b/ide/refactoring.api/src/org/netbeans/modules/refactoring/api/resources/layer.xml
@@ -74,9 +74,11 @@
             <file name="refactoring-preview.settings" url="refactoring-preview.settings"/>
         </folder>
     </folder>
+    <!-- disabled
     <folder name="WarmUp">
       <file name="org-netbeans-modules-refactoring-impl-RefactoringWarmUpTask.instance"/>
     </folder>
+    -->
   <folder name="Loaders">
     <folder name="folder">
         <folder name="any">
diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/JavaEditorWarmUpTask.java b/java/java.editor/src/org/netbeans/modules/java/editor/JavaEditorWarmUpTask.java
index 4231afc81a95..e0d04eb67d5a 100644
--- a/java/java.editor/src/org/netbeans/modules/java/editor/JavaEditorWarmUpTask.java
+++ b/java/java.editor/src/org/netbeans/modules/java/editor/JavaEditorWarmUpTask.java
@@ -56,7 +56,8 @@
  */
 public class JavaEditorWarmUpTask implements Runnable {
     
-    @ServiceProvider(service=Runnable.class,path="WarmUp")
+// disabled
+//    @ServiceProvider(service=Runnable.class,path="WarmUp")
     public static class Provider implements Runnable {
 
         private AtomicBoolean b = new AtomicBoolean();
diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
index 39f756b83d0b..6559065ade73 100644
--- a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
+++ b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
@@ -135,7 +135,9 @@
     </folder>
     
     <folder name="WarmUp">
+      <!-- disabled
       <file name="org-netbeans-modules-java-j2seplatform-J2SEPlatformWarmUp.instance"/>
+      -->
       <file name="org-netbeans-modules-java-j2seplatform-DebianJavaPlatformDetector.instance"/>
       <file name="org-netbeans-modules-java-j2seplatform-SdkManJavaPlatformDetector.instance"/>
     </folder>
diff --git a/platform/core.ui/src/org/netbeans/core/ui/warmup/ContextMenuWarmUpTask.java b/platform/core.ui/src/org/netbeans/core/ui/warmup/ContextMenuWarmUpTask.java
index 47a505a768b5..d1a95646bf3f 100644
--- a/platform/core.ui/src/org/netbeans/core/ui/warmup/ContextMenuWarmUpTask.java
+++ b/platform/core.ui/src/org/netbeans/core/ui/warmup/ContextMenuWarmUpTask.java
@@ -41,7 +41,8 @@
  *
  * @author  Tomas Pavek, Peter Zavadsky
  */
-@OnShowing
+// disabled
+//@OnShowing
 public final class ContextMenuWarmUpTask implements Runnable {
     @Override
     public void run() {
diff --git a/platform/core.ui/src/org/netbeans/core/ui/warmup/DnDWarmUpTask.java b/platform/core.ui/src/org/netbeans/core/ui/warmup/DnDWarmUpTask.java
index abba29349f86..8c371096843b 100644
--- a/platform/core.ui/src/org/netbeans/core/ui/warmup/DnDWarmUpTask.java
+++ b/platform/core.ui/src/org/netbeans/core/ui/warmup/DnDWarmUpTask.java
@@ -31,7 +31,8 @@
  *
  * @author  Dafe Simonek
  */
-@ServiceProvider(service=Runnable.class, path="WarmUp")
+// disabled
+//@ServiceProvider(service=Runnable.class, path="WarmUp")
 public final class DnDWarmUpTask implements Runnable {
 
     /** Performs DnD pre-heat.
diff --git a/platform/core.ui/src/org/netbeans/core/ui/warmup/MenuWarmUpTask.java b/platform/core.ui/src/org/netbeans/core/ui/warmup/MenuWarmUpTask.java
index 1f1f59afa726..4930640bb184 100644
--- a/platform/core.ui/src/org/netbeans/core/ui/warmup/MenuWarmUpTask.java
+++ b/platform/core.ui/src/org/netbeans/core/ui/warmup/MenuWarmUpTask.java
@@ -57,7 +57,8 @@
  * 
  * Plus hooked WindowListener on main window (see {@link NbWindowsAdapter})
  */
-@ServiceProvider(service=Runnable.class, path="WarmUp")
+// disabled
+//@ServiceProvider(service=Runnable.class, path="WarmUp")
 public final class MenuWarmUpTask implements Runnable {
 
     private Component[] comps;