diff --git a/platform/platform-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java b/platform/platform-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java
index 0adb4a81e547..e44921e6d5df 100644
--- a/platform/platform-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java
@@ -15,12 +15,14 @@
  */
 package com.intellij.ide.util;
 
+import com.intellij.openapi.components.RoamingType;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.components.StoragePathMacros;
 
 @State(
     name = "PropertiesComponent",
+    roamingType = RoamingType.DISABLED,
     storages = {@Storage(
         file = StoragePathMacros.WORKSPACE_FILE)})
 public class ProjectPropertiesComponentImpl extends PropertiesComponentImpl {
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/RoamingTypeExtensionPointBean.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/RoamingTypeExtensionPointBean.java
index edf8af9edc2a..ff5d16361228 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/RoamingTypeExtensionPointBean.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/RoamingTypeExtensionPointBean.java
@@ -17,6 +17,10 @@ package com.intellij.openapi.components.impl.stores;
 
 import com.intellij.util.xmlb.annotations.Attribute;
 
+/**
+ * @deprecated use {@link com.intellij.openapi.components.RoamingType#DISABLED}
+ */
+@Deprecated
 public class RoamingTypeExtensionPointBean {
   @Attribute("component")
   public String componentName;
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index 0eaa118227be..45c340a86ece 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -241,7 +241,6 @@
     <editorActionHandler action="EditorEscape" implementationClass="com.intellij.codeInsight.hint.EscapeHandler" id="hide-hints"/>
     <ComponentRoamingType component="ChangeListManager" type="DISABLED"/>
     <ComponentRoamingType component="RestoreUpdateTree" type="DISABLED"/>
-    <ComponentRoamingType component="PropertiesComponent" type="DISABLED"/>
 
     <projectConfigurable instance="com.intellij.javaee.ExternalResourceConfigurable" key="display.name.edit.external.resource"
                          bundle="messages.XmlBundle" id="preferences.externalResources">
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java
index 71e271d07a38..a4c30e62bda5 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java
@@ -55,11 +55,11 @@ class ChangeListManagerSerialization {
 
   @SuppressWarnings({"unchecked"})
   public void readExternal(final Element element) throws InvalidDataException {
-    final List<Element> listNodes = (List<Element>)element.getChildren(NODE_LIST);
+    final List<Element> listNodes = element.getChildren(NODE_LIST);
     for (Element listNode : listNodes) {
       readChangeList(listNode);
     }
-    final List<Element> ignoredNodes = (List<Element>)element.getChildren(NODE_IGNORED);
+    final List<Element> ignoredNodes = element.getChildren(NODE_IGNORED);
     for (Element ignoredNode: ignoredNodes) {
       readFileToIgnore(ignoredNode);
     }
@@ -74,7 +74,7 @@ class ChangeListManagerSerialization {
                                     null);
     }
     //noinspection unchecked
-    final List<Element> changeNodes = (List<Element>)listNode.getChildren(NODE_CHANGE);
+    final List<Element> changeNodes = listNode.getChildren(NODE_CHANGE);
     for (Element changeNode : changeNodes) {
       try {
         myWorker.addChangeToList(changeListName, readChange(changeNode), null);
@@ -84,10 +84,10 @@ class ChangeListManagerSerialization {
       }
     }
 
-    if (ChangeListManagerSerialization.ATT_VALUE_TRUE.equals(listNode.getAttributeValue(ATT_DEFAULT))) {
+    if (ATT_VALUE_TRUE.equals(listNode.getAttributeValue(ATT_DEFAULT))) {
       myWorker.setDefault(list.getName());
     }
-    if (ChangeListManagerSerialization.ATT_VALUE_TRUE.equals(listNode.getAttributeValue(ATT_READONLY))) {
+    if (ATT_VALUE_TRUE.equals(listNode.getAttributeValue(ATT_READONLY))) {
       list.setReadOnly(true);
     }
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/RestoreUpdateTree.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/RestoreUpdateTree.java
index b838bb97d25c..24c9a29b6c2d 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/RestoreUpdateTree.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/RestoreUpdateTree.java
@@ -41,8 +41,10 @@ public class RestoreUpdateTree implements ProjectComponent, JDOMExternalizable {
     myProject = project;
   }
 
+  @Override
   public void projectOpened() {
     StartupManager.getInstance(myProject).registerPostStartupActivity(new DumbAwareRunnable() {
+      @Override
       public void run() {
         if (myUpdateInfo != null && !myUpdateInfo.isEmpty() && ProjectReloadState.getInstance(myProject).isAfterAutomaticReload()) {
           ActionInfo actionInfo = myUpdateInfo.getActionInfo();
@@ -61,20 +63,25 @@ public class RestoreUpdateTree implements ProjectComponent, JDOMExternalizable {
     });
   }
 
+  @Override
   public void projectClosed() {
 
   }
 
+  @Override
   @NotNull
   public String getComponentName() {
     return "RestoreUpdateTree";
   }
 
+  @Override
   public void initComponent() { }
 
+  @Override
   public void disposeComponent() {
   }
 
+  @Override
   public void readExternal(Element element) throws InvalidDataException {
     Element child = element.getChild(UPDATE_INFO);
     if (child != null) {
@@ -84,6 +91,7 @@ public class RestoreUpdateTree implements ProjectComponent, JDOMExternalizable {
       }
   }
 
+  @Override
   public void writeExternal(Element element) throws WriteExternalException {
     if (myUpdateInfo != null) {
       Element child = new Element(UPDATE_INFO);
diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/src/META-INF/plugin.xml
index 06a2ce7679ab..3167d87b077c 100644
--- a/plugins/git4idea/src/META-INF/plugin.xml
+++ b/plugins/git4idea/src/META-INF/plugin.xml
@@ -166,7 +166,6 @@
     <applicationService serviceInterface="git4idea.DialogManager"
                         serviceImplementation="git4idea.DialogManager" />
 
-    <ComponentRoamingType component="Git.Settings" type="DISABLED"/>
     <fileTypeFactory implementation="git4idea.vfs.GitFileTypeFactory"/>
     <vcs.taskHandler implementation="git4idea.GitTaskHandler"/>
   </extensions>
diff --git a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java
index 2a930a5dab2d..4f74f7ca94f3 100644
--- a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java
+++ b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java
@@ -16,10 +16,7 @@
 package git4idea.config;
 
 import com.intellij.lifecycle.PeriodicalTasksCloser;
-import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.components.State;
-import com.intellij.openapi.components.Storage;
-import com.intellij.openapi.components.StoragePathMacros;
+import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.ArrayUtil;
 import git4idea.ui.branch.GitBranchSyncSetting;
@@ -34,7 +31,7 @@ import java.util.Map;
 /**
  * Git VCS settings
  */
-@State(name = "Git.Settings", storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE)})
+@State(name = "Git.Settings", roamingType = RoamingType.DISABLED, storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE)})
 public class GitVcsSettings implements PersistentStateComponent<GitVcsSettings.State> {
 
   private static final int PREVIOUS_COMMIT_AUTHORS_LIMIT = 16; // Limit for previous commit authors
diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index cff125884e80..e1a1a0b717ee 100644
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -138,8 +138,6 @@
                     serviceImplementation="org.jetbrains.idea.svn.dialogs.browserCache.CacheLoader"/>
 
     <vcs name="svn" vcsClass="org.jetbrains.idea.svn.SvnVcs" displayName="Subversion" administrativeAreaName=".svn, _svn" crawlUpToCheckUnderVcs="true"/>
-
-    <ComponentRoamingType component="SvnConfiguration" type="DISABLED"/>
     <vcsPopupProvider implementation="org.jetbrains.idea.svn.actions.SvnQuickListContentProvider"/>
   </extensions>
 </idea-plugin>
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
index cdf94dcb7543..b4f799153824 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
@@ -62,6 +62,7 @@ import java.util.*;
 
 @State(
   name = "SvnConfiguration",
+  roamingType = RoamingType.DISABLED,
   storages = {
     @Storage(
       file = StoragePathMacros.WORKSPACE_FILE