diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
index 0875b2ccf9f8..534fa9481095 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
@@ -279,7 +279,9 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
     if (isHeadless()) {
       String headlessImplClass = config.headlessImplementationClass;
       if (headlessImplClass != null) {
-        if (headlessImplClass.trim().length() == 0) return;
+        if (headlessImplClass.trim().length() == 0) {
+          return;
+        }
         config.implementationClass = headlessImplClass;
       }
     }
diff --git a/platform/platform-resources/src/META-INF/xdebugger.xml b/platform/platform-resources/src/META-INF/xdebugger.xml
index b427b831d37d..f26877c1d973 100644
--- a/platform/platform-resources/src/META-INF/xdebugger.xml
+++ b/platform/platform-resources/src/META-INF/xdebugger.xml
@@ -3,13 +3,11 @@
     <component>
       <interface-class>com.intellij.xdebugger.XDebuggerManager</interface-class>
       <implementation-class>com.intellij.xdebugger.impl.XDebuggerManagerImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
       <interface-class>com.intellij.xdebugger.impl.evaluate.quick.common.ValueLookupManager</interface-class>
       <implementation-class>com.intellij.xdebugger.impl.evaluate.quick.common.ValueLookupManager</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 
diff --git a/platform/platform-resources/src/componentSets/Editor.xml b/platform/platform-resources/src/componentSets/Editor.xml
index 47cdd13876a4..4362f1b6dbad 100644
--- a/platform/platform-resources/src/componentSets/Editor.xml
+++ b/platform/platform-resources/src/componentSets/Editor.xml
@@ -22,17 +22,14 @@
     <component>
       <interface-class>com.intellij.openapi.editor.impl.DocumentMarkupModelManager</interface-class>
       <implementation-class>com.intellij.openapi.editor.impl.DocumentMarkupModelManager</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.openapi.fileEditor.impl.EditorHistoryManager</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
     <component>
       <interface-class>com.intellij.openapi.fileEditor.ex.IdeDocumentHistory</interface-class>
       <implementation-class>com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.openapi.editor.LazyRangeMarkerFactory</implementation-class>
diff --git a/platform/platform-resources/src/componentSets/Execution.xml b/platform/platform-resources/src/componentSets/Execution.xml
index 4ec20ef747f7..61b5a11ff244 100644
--- a/platform/platform-resources/src/componentSets/Execution.xml
+++ b/platform/platform-resources/src/componentSets/Execution.xml
@@ -15,16 +15,13 @@
       <interface-class>com.intellij.execution.RunManager</interface-class>
       <implementation-class>com.intellij.execution.impl.RunManagerImpl</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.execution.impl.ProjectRunConfigurationManager</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <interface-class>com.intellij.execution.ExecutionManager</interface-class>
       <implementation-class>com.intellij.execution.impl.ExecutionManagerImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 </components>
\ No newline at end of file
diff --git a/platform/platform-resources/src/componentSets/Lang.xml b/platform/platform-resources/src/componentSets/Lang.xml
index 81c65520a746..cac6b3fcd3d2 100644
--- a/platform/platform-resources/src/componentSets/Lang.xml
+++ b/platform/platform-resources/src/componentSets/Lang.xml
@@ -39,7 +39,6 @@
     <component>
       <interface-class>com.intellij.codeInsight.highlighting.HighlightManager</interface-class>
       <implementation-class>com.intellij.codeInsight.highlighting.HighlightManagerImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
@@ -74,7 +73,6 @@
     <component>
       <interface-class>com.intellij.codeInsight.folding.CodeFoldingManager</interface-class>
       <implementation-class>com.intellij.codeInsight.folding.impl.CodeFoldingManagerImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
@@ -82,7 +80,6 @@
       <implementation-class>com.intellij.openapi.fileEditor.impl.PsiAwareFileEditorManagerImpl</implementation-class>
       <headless-implementation-class>com.intellij.testFramework.TestEditorManagerImpl</headless-implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
 
     <component>
@@ -104,11 +101,9 @@
       <interface-class>com.intellij.codeInsight.daemon.DaemonCodeAnalyzer</interface-class>
       <implementation-class>com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.codeInsight.daemon.impl.EditorTracker</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.codeInsight.daemon.impl.GeneralHighlightingPassFactory</implementation-class>
@@ -185,18 +180,15 @@
     <component>
       <interface-class>com.intellij.pom.wrappers.PsiEventWrapperAspect</interface-class>
       <implementation-class>com.intellij.pom.wrappers.PsiEventWrapperAspect</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
       <implementation-class>com.intellij.openapi.vcs.changes.VcsEventWatcher</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
       <interface-class>com.intellij.codeInsight.preview.ImageOrColorPreviewProjectComponent</interface-class>
       <implementation-class>com.intellij.codeInsight.preview.ImageOrColorPreviewProjectComponent</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
diff --git a/platform/platform-resources/src/componentSets/Platform.xml b/platform/platform-resources/src/componentSets/Platform.xml
index e2462c86fa1f..d88f33c0a1b7 100644
--- a/platform/platform-resources/src/componentSets/Platform.xml
+++ b/platform/platform-resources/src/componentSets/Platform.xml
@@ -124,37 +124,31 @@
       <interface-class>com.intellij.ide.util.PropertiesComponent</interface-class>
       <implementation-class>com.intellij.ide.util.ProjectPropertiesComponentImpl</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
 
     <component>
       <interface-class>com.intellij.openapi.command.undo.UndoManager</interface-class>
       <implementation-class>com.intellij.openapi.command.impl.UndoManagerImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
       <interface-class>com.intellij.openapi.project.ProjectReloadState</interface-class>
       <implementation-class>com.intellij.openapi.project.impl.ProjectReloadStateImpl</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
 
     <component>
       <interface-class>com.intellij.openapi.vcs.FileStatusManager</interface-class>
       <implementation-class>com.intellij.openapi.vcs.impl.FileStatusManagerImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
       <implementation-class>com.intellij.ui.EditorNotifications</implementation-class>
-      <skipForDummyProject/>
     </component>
     
     <component>
       <interface-class>com.intellij.openapi.vfs.encoding.EncodingProjectManager</interface-class>
       <implementation-class>com.intellij.openapi.vfs.encoding.EncodingProjectManagerImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
@@ -163,7 +157,6 @@
 
     <component>
       <implementation-class>com.intellij.notification.impl.ProjectNotificationsComponent</implementation-class>
-      <skipForDummyProject/>
       <skipForDefaultProject/>
     </component>
   </project-components>
diff --git a/platform/platform-resources/src/componentSets/PlatformComponents.xml b/platform/platform-resources/src/componentSets/PlatformComponents.xml
index 2cbb9f3ec2d0..5ccba837c053 100644
--- a/platform/platform-resources/src/componentSets/PlatformComponents.xml
+++ b/platform/platform-resources/src/componentSets/PlatformComponents.xml
@@ -52,12 +52,10 @@
       <implementation-class>com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl</implementation-class>
       <headless-implementation-class>com.intellij.testFramework.TestEditorManagerImpl</headless-implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
 
     <component>
       <implementation-class>com.intellij.platform.PlatformVcsDetector</implementation-class>
-      <skipForDummyProject/>
     </component>
 
   </project-components>
diff --git a/platform/platform-resources/src/componentSets/PlatformLangComponents.xml b/platform/platform-resources/src/componentSets/PlatformLangComponents.xml
index 64a5bf872417..8b66914a36fd 100644
--- a/platform/platform-resources/src/componentSets/PlatformLangComponents.xml
+++ b/platform/platform-resources/src/componentSets/PlatformLangComponents.xml
@@ -46,7 +46,6 @@
   <project-components>
     <component>
       <implementation-class>com.intellij.platform.PlatformVcsDetector</implementation-class>
-      <skipForDummyProject/>
     </component>
 
   </project-components>
diff --git a/platform/platform-resources/src/componentSets/Profiles.xml b/platform/platform-resources/src/componentSets/Profiles.xml
index 025c74496aee..538a092fdd86 100644
--- a/platform/platform-resources/src/componentSets/Profiles.xml
+++ b/platform/platform-resources/src/componentSets/Profiles.xml
@@ -2,7 +2,6 @@
   <project-components>
     <component>
       <implementation-class>com.intellij.profile.codeInspection.InspectionProjectProfileManager</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 </components>
\ No newline at end of file
diff --git a/platform/platform-resources/src/componentSets/UICore.xml b/platform/platform-resources/src/componentSets/UICore.xml
index 4eb656496bf1..6bdbbc9d69af 100644
--- a/platform/platform-resources/src/componentSets/UICore.xml
+++ b/platform/platform-resources/src/componentSets/UICore.xml
@@ -7,7 +7,6 @@
       <interface-class>com.intellij.openapi.wm.IdeFocusManager</interface-class>
       <implementation-class>com.intellij.openapi.wm.impl.FocusManagerImpl</implementation-class>
       <headless-implementation-class>com.intellij.openapi.wm.impl.IdeFocusManagerHeadless</headless-implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <interface-class>com.intellij.ide.DataManager</interface-class>
@@ -65,7 +64,6 @@
     <component>
       <interface-class>com.intellij.execution.ui.RunnerLayoutUi$Factory</interface-class>
       <implementation-class>com.intellij.execution.ui.layout.impl.RunnerLayoutUiFactoryImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.openapi.actionSystem.impl.ActionPreloader</implementation-class>
diff --git a/platform/platform-resources/src/componentSets/VCS.xml b/platform/platform-resources/src/componentSets/VCS.xml
index f1c6ab9ac4f6..1f9ebf4f36eb 100644
--- a/platform/platform-resources/src/componentSets/VCS.xml
+++ b/platform/platform-resources/src/componentSets/VCS.xml
@@ -14,17 +14,14 @@
     <component>
       <implementation-class>com.intellij.openapi.vcs.VcsConfiguration</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
     <component>
       <interface-class>com.intellij.openapi.vcs.ProjectLevelVcsManager</interface-class>
       <implementation-class>com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.openapi.vcs.impl.VcsDirectoryMappingStorage</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.openapi.vcs.impl.LineStatusTrackerManager</implementation-class>
@@ -59,7 +56,6 @@
     <component>
       <implementation-class>com.intellij.openapi.vcs.changes.shelf.ShelveChangesManager</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.openapi.vcs.changes.shelf.ShelvedChangesViewManager</implementation-class>
diff --git a/platform/platform-resources/src/componentSets/WindowManagement.xml b/platform/platform-resources/src/componentSets/WindowManagement.xml
index bca044d7b092..6a4b4a9b85e0 100644
--- a/platform/platform-resources/src/componentSets/WindowManagement.xml
+++ b/platform/platform-resources/src/componentSets/WindowManagement.xml
@@ -13,13 +13,11 @@
       <implementation-class>com.intellij.openapi.wm.impl.ToolWindowManagerImpl</implementation-class>
       <headless-implementation-class>com.intellij.openapi.wm.impl.ToolWindowHeadlessManagerImpl</headless-implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
     <component>
       <interface-class>com.intellij.openapi.wm.IdeFocusManager</interface-class>
       <implementation-class>com.intellij.openapi.wm.impl.IdeFocusManagerImpl</implementation-class>
       <headless-implementation-class>com.intellij.openapi.wm.impl.IdeFocusManagerHeadless</headless-implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 </components>
\ No newline at end of file
diff --git a/plugins/ant/src/META-INF/plugin.xml b/plugins/ant/src/META-INF/plugin.xml
index 25498418f3ff..adabd25c7cfa 100644
--- a/plugins/ant/src/META-INF/plugin.xml
+++ b/plugins/ant/src/META-INF/plugin.xml
@@ -71,7 +71,6 @@
   <project-components>
     <component>
       <implementation-class>com.intellij.lang.ant.config.impl.AntToolwindowRegistrar</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 
diff --git a/plugins/devkit/src/dom/Component.java b/plugins/devkit/src/dom/Component.java
index 0ec760843349..0cc774f87916 100644
--- a/plugins/devkit/src/dom/Component.java
+++ b/plugins/devkit/src/dom/Component.java
@@ -58,11 +58,6 @@ public interface Component extends DomElement {
   }
 
   interface Project extends Component {
-
-    @NotNull
-    @SubTag(value = "skipForDummyProject", indicator = true)
-    GenericDomValue<Boolean> getSkipForDummyProject();
-
     @NotNull
     @SubTag(value = "skipForDefaultProject", indicator = true)
     GenericDomValue<Boolean> getSkipForDefaultProject();
diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml
index 8a99895d1ad8..9b186440ac84 100644
--- a/plugins/properties/src/META-INF/plugin.xml
+++ b/plugins/properties/src/META-INF/plugin.xml
@@ -61,7 +61,6 @@
     <component>
       <implementation-class>com.intellij.lang.properties.PropertiesFilesManager</implementation-class>
       <skipForDefaultProject/>
-      <skipForDummyProject/>
     </component>
   </project-components>
 </idea-plugin>
diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml
index 073110c20c35..6c1f403e23aa 100644
--- a/plugins/ui-designer/src/META-INF/plugin.xml
+++ b/plugins/ui-designer/src/META-INF/plugin.xml
@@ -116,7 +116,6 @@
   <project-components>
     <component>
       <implementation-class>com.intellij.uiDesigner.palette.Palette</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.uiDesigner.propertyInspector.UIDesignerToolWindowManager</implementation-class>
@@ -125,7 +124,6 @@
     </component>
     <component>
       <implementation-class>com.intellij.uiDesigner.clientProperties.ClientPropertiesManager</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 
diff --git a/resources/src/componentSets/Compiler.xml b/resources/src/componentSets/Compiler.xml
index 01cb22a0e9b3..dd58573060fc 100644
--- a/resources/src/componentSets/Compiler.xml
+++ b/resources/src/componentSets/Compiler.xml
@@ -13,11 +13,9 @@
     <component>
       <interface-class>com.intellij.compiler.CompilerConfiguration</interface-class>
       <implementation-class>com.intellij.compiler.CompilerConfigurationImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <implementation-class>com.intellij.compiler.impl.CompilerCacheManager</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 </components>
diff --git a/resources/src/componentSets/Configurables.xml b/resources/src/componentSets/Configurables.xml
index cf7c734deedc..2dc65706f863 100644
--- a/resources/src/componentSets/Configurables.xml
+++ b/resources/src/componentSets/Configurables.xml
@@ -3,7 +3,6 @@
     <component>
       <implementation-class>com.intellij.openapi.roots.ui.configuration.ModuleEditorState</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
 
     <!--
diff --git a/resources/src/componentSets/Core.xml b/resources/src/componentSets/Core.xml
index 346675cc3fe6..3914cf98288d 100644
--- a/resources/src/componentSets/Core.xml
+++ b/resources/src/componentSets/Core.xml
@@ -9,7 +9,6 @@
     </component>
     <component>
       <implementation-class>com.intellij.util.xml.impl.JavaDomApplicationComponent</implementation-class>
-      <skipForDummyProject/>
     </component>
   </application-components>
 
@@ -18,7 +17,6 @@
     <component>
       <interface-class>com.intellij.facet.impl.autodetecting.FacetAutodetectingManager</interface-class>
       <implementation-class>com.intellij.facet.impl.autodetecting.FacetAutodetectingManagerImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <interface-class>com.intellij.facet.pointers.FacetPointersManager</interface-class>
@@ -36,7 +34,6 @@
     <component>
       <interface-class>com.intellij.pom.java.PomJavaAspect</interface-class>
       <implementation-class>com.intellij.pom.java.impl.PomJavaAspectImpl</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 
diff --git a/resources/src/componentSets/Debugger.xml b/resources/src/componentSets/Debugger.xml
index e6a564a41f2d..42ac276ac1fc 100644
--- a/resources/src/componentSets/Debugger.xml
+++ b/resources/src/componentSets/Debugger.xml
@@ -3,24 +3,20 @@
     <component>
       <interface-class>com.intellij.debugger.ui.DebuggerPanelsManager</interface-class>
       <implementation-class>com.intellij.debugger.ui.DebuggerPanelsManager</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <interface-class>com.intellij.debugger.impl.HotSwapManager</interface-class>
       <implementation-class>com.intellij.debugger.impl.HotSwapManager</implementation-class>
-      <skipForDummyProject/>
     </component>
     <component>
       <interface-class>com.intellij.debugger.ui.HotSwapUI</interface-class>
       <implementation-class>com.intellij.debugger.ui.HotSwapUIImpl</implementation-class>      
-      <skipForDummyProject/>
     </component>
 
     <component>
       <interface-class>com.intellij.debugger.DebuggerManager</interface-class>
       <implementation-class>com.intellij.debugger.impl.DebuggerManagerImpl</implementation-class>
       <option name="workspace" value="true"/>
-      <skipForDummyProject/>
     </component>
   </project-components>
 
diff --git a/resources/src/componentSets/IdeaComponents.xml b/resources/src/componentSets/IdeaComponents.xml
index 49424a12a762..4a6feaa25f53 100644
--- a/resources/src/componentSets/IdeaComponents.xml
+++ b/resources/src/componentSets/IdeaComponents.xml
@@ -45,12 +45,10 @@
   <project-components>
     <component>
       <implementation-class>com.intellij.openapi.vcs.impl.ModuleVcsDetector</implementation-class>
-      <skipForDummyProject/>
     </component>
 
     <component>
       <implementation-class>com.intellij.profile.codeInspection.InspectionProjectProfileManager</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 
diff --git a/resources/src/componentSets/Misc.xml b/resources/src/componentSets/Misc.xml
index 89d4ddc6e1f6..f5f8481c6916 100644
--- a/resources/src/componentSets/Misc.xml
+++ b/resources/src/componentSets/Misc.xml
@@ -10,7 +10,6 @@
     <component>
       <interface-class>com.intellij.javadoc.JavadocGenerationManager</interface-class>
       <implementation-class>com.intellij.javadoc.JavadocGenerationManager</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 
diff --git a/resources/src/componentSets/Toolwindows.xml b/resources/src/componentSets/Toolwindows.xml
index e602dd501f16..4558cbfc6006 100644
--- a/resources/src/componentSets/Toolwindows.xml
+++ b/resources/src/componentSets/Toolwindows.xml
@@ -2,7 +2,6 @@
   <project-components>
     <component>
       <implementation-class>com.intellij.ide.palette.impl.PaletteManager</implementation-class>
-      <skipForDummyProject/>
     </component>
   </project-components>
 </components>