diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java b/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
index b7315395a279..c9fbeaa96982 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
@@ -325,8 +325,6 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
     NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND = rootSettings.NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND;
     PACKAGES_TO_USE_IMPORT_ON_DEMAND.copyFrom(rootSettings.PACKAGES_TO_USE_IMPORT_ON_DEMAND);
     IMPORT_LAYOUT_TABLE.copyFrom(rootSettings.IMPORT_LAYOUT_TABLE);
-    REPLACE_INSTANCEOF_AND_CAST = rootSettings.REPLACE_INSTANCEOF;
-    REPLACE_NULL_CHECK = rootSettings.REPLACE_NULL_CHECK;
     FIELD_NAME_PREFIX = rootSettings.FIELD_NAME_PREFIX;
     STATIC_FIELD_NAME_PREFIX = rootSettings.STATIC_FIELD_NAME_PREFIX;
     PARAMETER_NAME_PREFIX = rootSettings.PARAMETER_NAME_PREFIX;
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
index c10099ef4e86..75bdd4abb525 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
@@ -322,19 +322,6 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea
     myRepeatAnnotations.addAll(repeatAnnotations);
   }
 
-  //----------------- FUNCTIONAL EXPRESSIONS -----
-
-  /** @deprecated Use JavaCodeStyleSettings.REPLACE_INSTANCEOF_AND_CAST */
-  @Deprecated
-  public boolean REPLACE_INSTANCEOF;
-  /** @deprecated Use JavaCodeStyleSettings.REPLACE_INSTANCEOF_AND_CAST */
-  @Deprecated
-  public boolean REPLACE_CAST;
-  /** @deprecated Use JavaCodeStyleSettings.REPLACE_NULL_CHECK */
-  @Deprecated
-  public boolean REPLACE_NULL_CHECK = true;
-
-
   //----------------- JAVA IMPORTS (deprecated, moved to JavaCodeStyleSettings) --------------------
 
   /** @deprecated Use JavaCodeStyleSettings.LAYOUT_STATIC_IMPORTS_SEPARATELY */