diff --git a/platform/analysis-api/resources/META-INF/analysis-api.xml b/platform/analysis-api/resources/META-INF/analysis-api.xml
index 904f1da7e131..3723ea0e327a 100644
--- a/platform/analysis-api/resources/META-INF/analysis-api.xml
+++ b/platform/analysis-api/resources/META-INF/analysis-api.xml
@@ -1,15 +1,14 @@
 <idea-plugin>
   <extensionPoints>
-    <extensionPoint name="languageInjector"
-                    interface="com.intellij.psi.LanguageInjector"/>
+    <extensionPoint name="languageInjector" interface="com.intellij.psi.LanguageInjector" dynamic="true"/>
     <extensionPoint name="completion.contributor" beanClass="com.intellij.codeInsight.completion.CompletionContributorEP">
       <with attribute="implementationClass" implements="com.intellij.codeInsight.completion.CompletionContributor"/>
     </extensionPoint>
 
-    <extensionPoint name="gotoDeclarationHandler" dynamic="true"
-                    interface="com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler"/>
+    <extensionPoint name="gotoDeclarationHandler" interface="com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler"
+                    dynamic="true"/>
   </extensionPoints>
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceImplementation="com.intellij.psi.search.scope.packageSet.NamedScopeManager"/>
   </extensions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/platform/core-api/resources/META-INF/core-api.xml b/platform/core-api/resources/META-INF/core-api.xml
index 311c833075fe..c7579fe959a6 100644
--- a/platform/core-api/resources/META-INF/core-api.xml
+++ b/platform/core-api/resources/META-INF/core-api.xml
@@ -11,9 +11,7 @@
     <extensionPoint name="backgroundPostStartupActivity" interface="com.intellij.openapi.startup.StartupActivity" dynamic="true"/>
     <extensionPoint name="fileTypeDetector" interface="com.intellij.openapi.fileTypes.FileTypeRegistry$FileTypeDetector"/>
     <extensionPoint name="editorFactoryDocumentListener" interface="com.intellij.openapi.editor.event.DocumentListener"/>
-    <extensionPoint name="multiHostInjector"
-                    interface="com.intellij.lang.injection.MultiHostInjector"
-                    area="IDEA_PROJECT"/>
+    <extensionPoint name="multiHostInjector" interface="com.intellij.lang.injection.MultiHostInjector" area="IDEA_PROJECT" dynamic="true"/>
     <extensionPoint name="writingAccessProvider" area="IDEA_PROJECT" interface="com.intellij.openapi.vfs.WritingAccessProvider"/>
     <extensionPoint name="metaLanguage" interface="com.intellij.lang.MetaLanguage"/>
     <extensionPoint name="lang.parserDefinition" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
diff --git a/platform/core-impl/resources/META-INF/core-impl.xml b/platform/core-impl/resources/META-INF/core-impl.xml
index 19d05d35ba6d..042886c83bd5 100644
--- a/platform/core-impl/resources/META-INF/core-impl.xml
+++ b/platform/core-impl/resources/META-INF/core-impl.xml
@@ -11,8 +11,7 @@
     <extensionPoint name="psi.referenceContributor" beanClass="com.intellij.psi.impl.source.resolve.reference.PsiReferenceContributorEP" dynamic="true">
       <with attribute="implementation" implements="com.intellij.psi.PsiReferenceContributor"/>
     </extensionPoint>
-    <extensionPoint name="lang.ast.factory"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+    <extensionPoint name="lang.ast.factory" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
       <with attribute="implementationClass" implements="com.intellij.lang.ASTFactory"/>
     </extensionPoint>
   </extensionPoints>
diff --git a/platform/platform-resources/src/META-INF/CompletionExtensionPoints.xml b/platform/platform-resources/src/META-INF/CompletionExtensionPoints.xml
index 3a23fe2112c6..19dba71806cd 100644
--- a/platform/platform-resources/src/META-INF/CompletionExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/CompletionExtensionPoints.xml
@@ -1,8 +1,5 @@
 <idea-plugin>
   <extensionPoints>
-    <extensionPoint name="completion.contributor" beanClass="com.intellij.codeInsight.completion.CompletionContributorEP" dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.codeInsight.completion.CompletionContributor"/>
-    </extensionPoint>
 
     <extensionPoint name="completion.confidence" beanClass="com.intellij.codeInsight.completion.CompletionConfidenceEP" dynamic="true">
       <with attribute="implementationClass" implements="com.intellij.codeInsight.completion.CompletionConfidence"/>
@@ -32,10 +29,6 @@
       <with attribute="implementationClass" implements="com.intellij.ide.actions.CreateDirectoryCompletionContributor"/>
     </extensionPoint>
 
-    <extensionPoint name="completionData" beanClass="com.intellij.codeInsight.completion.CompletionDataEP">
-      <with attribute="className" implements="com.intellij.codeInsight.completion.CompletionData"/>
-    </extensionPoint>
-
     <extensionPoint name="codeInsight.wordCompletionFilter" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
       <with attribute="implementationClass" implements="com.intellij.lang.WordCompletionElementFilter"/>
     </extensionPoint>
@@ -46,4 +39,4 @@
 
     <extensionPoint name="elementLookupRenderer" interface="com.intellij.codeInsight.lookup.impl.ElementLookupRenderer" dynamic="true"/>
   </extensionPoints>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index 001eb0747856..9b930ba0ee61 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -69,16 +69,12 @@
     <extensionPoint name="daemon.externalAnnotatorsFilter" interface="com.intellij.lang.ExternalAnnotatorsFilter" dynamic="true"/>
     <extensionPoint name="daemon.changeLocalityDetector" interface="com.intellij.codeInsight.daemon.ChangeLocalityDetector" dynamic="true"/>
 
-    <extensionPoint name="severitiesProvider" interface="com.intellij.codeInsight.daemon.impl.SeveritiesProvider"/>
-
     <extensionPoint name="implicitUsageProvider" interface="com.intellij.codeInsight.daemon.ImplicitUsageProvider" dynamic="true"/>
 
     <!-- com.intellij.psi.PsiElement -->
     <extensionPoint name="cantBeStatic" interface="com.intellij.openapi.util.Condition" dynamic="true"/>
 
-    <extensionPoint name="languageInjector" interface="com.intellij.psi.LanguageInjector" dynamic="true"/>
     <extensionPoint name="concatenationAwareInjector" interface="com.intellij.lang.injection.ConcatenationAwareInjector" area="IDEA_PROJECT" dynamic="true"/>
-    <extensionPoint name="multiHostInjector" interface="com.intellij.lang.injection.MultiHostInjector" area="IDEA_PROJECT" dynamic="true"/>
     <extensionPoint name="referenceInjector" interface="com.intellij.psi.injection.ReferenceInjector" dynamic="true"/>
 
     <extensionPoint name="annotator" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
@@ -128,10 +124,6 @@
 
     <extensionPoint name="lang.structureViewExtension" interface="com.intellij.ide.structureView.StructureViewExtension"/>
 
-    <extensionPoint name="lang.ast.factory" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.lang.ASTFactory"/>
-    </extensionPoint>
-
     <extensionPoint name="lang.surroundDescriptor" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
       <with attribute="implementationClass" implements="com.intellij.lang.surroundWith.SurroundDescriptor"/>
     </extensionPoint>
@@ -559,8 +551,6 @@
     <extensionPoint name="treeCopyHandler" interface="com.intellij.psi.impl.source.tree.TreeCopyHandler" dynamic="true"/>
     <extensionPoint name="treeGenerator" interface="com.intellij.psi.impl.source.tree.TreeGenerator" dynamic="true"/>
 
-    <extensionPoint name="psi.treeChangePreprocessor" interface="com.intellij.psi.impl.PsiTreeChangePreprocessor" area="IDEA_PROJECT" dynamic="true"/>
-
     <extensionPoint name="moduleRendererFactory" interface="com.intellij.ide.util.ModuleRendererFactory" dynamic="true"/>
 
     <extensionPoint name="module.workingDirectoryProvider" interface="com.intellij.openapi.module.WorkingDirectoryProvider" dynamic="true"/>
diff --git a/platform/projectModel-api/resources/META-INF/projectModel-api.xml b/platform/projectModel-api/resources/META-INF/projectModel-api.xml
index 2766b1bdea8f..a82de17035b9 100644
--- a/platform/projectModel-api/resources/META-INF/projectModel-api.xml
+++ b/platform/projectModel-api/resources/META-INF/projectModel-api.xml
@@ -2,7 +2,7 @@
   <extensionPoints>
     <extensionPoint name="moduleExtension" interface="com.intellij.openapi.roots.ModuleExtension" area="IDEA_MODULE"/>
     <extensionPoint name="orderEnumerationHandlerFactory" interface="com.intellij.openapi.roots.OrderEnumerationHandler$Factory"/>
-    <extensionPoint name="filePropertyPusher" interface="com.intellij.openapi.roots.impl.FilePropertyPusher"/>
+    <extensionPoint name="filePropertyPusher" interface="com.intellij.openapi.roots.impl.FilePropertyPusher" dynamic="true"/>
     <extensionPoint name="orderRootType" interface="com.intellij.openapi.roots.OrderRootType"/>
   </extensionPoints>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/platform/projectModel-impl/resources/META-INF/projectModel-impl.xml b/platform/projectModel-impl/resources/META-INF/projectModel-impl.xml
index aa2340ed16cf..339c49329804 100644
--- a/platform/projectModel-impl/resources/META-INF/projectModel-impl.xml
+++ b/platform/projectModel-impl/resources/META-INF/projectModel-impl.xml
@@ -3,7 +3,7 @@
     <extensionPoint name="additionalLibraryRootsProvider" interface="com.intellij.openapi.roots.AdditionalLibraryRootsProvider"/>
     <extensionPoint name="directoryIndexExcludePolicy" interface="com.intellij.openapi.roots.impl.DirectoryIndexExcludePolicy"
                     area="IDEA_PROJECT"/>
-    <extensionPoint name="projectExtension" interface="com.intellij.openapi.roots.ProjectExtension" area="IDEA_PROJECT"/>
+    <extensionPoint name="projectExtension" interface="com.intellij.openapi.roots.ProjectExtension" area="IDEA_PROJECT" dynamic="true"/>
   </extensionPoints>
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceInterface="com.intellij.openapi.roots.impl.DirectoryIndex"