diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java b/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java
index af98a79a9862..a8fa5a5905b2 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java
@@ -224,7 +224,7 @@ public class RequestHint {
           boolean isGetter = ApplicationManager.getApplication().runReadAction(new Computable<Boolean>(){
             public Boolean compute() {
               PsiElement contextElement = PositionUtil.getContextElement(context);
-              return (contextElement != null && DebuggerUtils.isInsideSimpleGetter(contextElement))? Boolean.TRUE : Boolean.FALSE;
+              return contextElement != null && DebuggerUtils.isInsideSimpleGetter(contextElement);
             }
           }).booleanValue();
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ToggleButtonBinding.java b/java/debugger/impl/src/com/intellij/debugger/settings/ToggleButtonBinding.java
index 03b850a88d75..30a7a7def025 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/ToggleButtonBinding.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/ToggleButtonBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public class ToggleButtonBinding extends FieldDataBinding{
   }
 
   public void doSaveData(Object to, Field field) throws IllegalAccessException{
-    field.set(to, myToggleButton.isSelected()? Boolean.TRUE : Boolean.FALSE);
+    field.set(to, myToggleButton.isSelected());
   }
 
   protected boolean isModified(Object obj, Field field) throws IllegalAccessException {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
index 31c498db79b6..d1fc01f56772 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
@@ -190,7 +190,7 @@ public abstract class BreakpointWithHighlighter<P extends JavaBreakpointProperti
     return ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
       @Override
       public Boolean compute() {
-        return sourcePosition != null && sourcePosition.getFile().isValid() ? Boolean.TRUE : Boolean.FALSE;
+        return sourcePosition != null && sourcePosition.getFile().isValid();
       }
     }).booleanValue();
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/FieldDescriptorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/FieldDescriptorImpl.java
index 5aa8711e5ae5..88a1ebeffca5 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/FieldDescriptorImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/FieldDescriptorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import com.intellij.debugger.impl.PositionUtil;
 import com.intellij.debugger.settings.NodeRendererSettings;
 import com.intellij.debugger.ui.tree.FieldDescriptor;
 import com.intellij.debugger.ui.tree.NodeDescriptor;
-import com.intellij.debugger.ui.tree.render.ClassRenderer;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.JavaPsiFacade;
@@ -83,7 +82,7 @@ public class FieldDescriptorImpl extends ValueDescriptorImpl implements FieldDes
         myIsPrimitive = super.isPrimitive();
       }
       else {
-        myIsPrimitive = DebuggerUtils.isPrimitiveType(myField.typeName()) ? Boolean.TRUE : Boolean.FALSE;
+        myIsPrimitive = DebuggerUtils.isPrimitiveType(myField.typeName());
       }
     }
     return myIsPrimitive.booleanValue();
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BasicRendererProperties.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BasicRendererProperties.java
index d00e601a213b..36b65176308d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BasicRendererProperties.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BasicRendererProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public final class BasicRendererProperties implements Cloneable, JDOMExternaliza
   }
 
   public void setEnabled(final boolean enabled) {
-    myEnabled = enabled? Boolean.TRUE : Boolean.FALSE;
+    myEnabled = enabled;
   }
 
   public String getClassName() {
@@ -79,7 +79,7 @@ public final class BasicRendererProperties implements Cloneable, JDOMExternaliza
       }
       else if (ENABLED_OPTION.equals(optionName)) {
         final String val = option.getAttributeValue("value");
-        myEnabled = "true".equalsIgnoreCase(val)? Boolean.TRUE : Boolean.FALSE;
+        myEnabled = "true".equalsIgnoreCase(val);
       }
       else if (CLASSNAME_OPTION.equals(optionName)) {
         myClassName = option.getAttributeValue("value");
diff --git a/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionTable.java b/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionTable.java
index 58c93bd9287b..a53ad0c75d33 100644
--- a/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionTable.java
+++ b/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@ public class MemberSelectionTable extends AbstractMemberSelectionTable<PsiMember
       return myMemberInfoModel.isAbstractWhenDisabled(memberInfo);
     }
     else {
-      return memberInfo.isToAbstract() ? Boolean.TRUE : Boolean.FALSE;
+      return memberInfo.isToAbstract();
     }
   }
 
diff --git a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java
index b578371579e4..b12da0bcbd7a 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java
@@ -285,7 +285,7 @@ public abstract class ParameterTablePanel extends JPanel {
     public Object getValueAt(int rowIndex, int columnIndex) {
       switch (columnIndex) {
         case CHECKMARK_COLUMN: {
-          return getVariableData()[rowIndex].passAsParameter ? Boolean.TRUE : Boolean.FALSE;
+          return getVariableData()[rowIndex].passAsParameter;
         }
         case PARAMETER_NAME_COLUMN: {
           return getVariableData()[rowIndex].name;
diff --git a/java/java-impl/src/com/intellij/refactoring/util/classMembers/MemberInfo.java b/java/java-impl/src/com/intellij/refactoring/util/classMembers/MemberInfo.java
index 272d5b032d35..c35e9ff2ab29 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/classMembers/MemberInfo.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/classMembers/MemberInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public class MemberInfo extends MemberInfoBase<PsiMember> {
       );
       PsiMethod[] superMethods = method.findSuperMethods();
       if (superMethods.length > 0) {
-        overrides = !superMethods[0].hasModifierProperty(PsiModifier.ABSTRACT) ? Boolean.TRUE : Boolean.FALSE;
+        overrides = !superMethods[0].hasModifierProperty(PsiModifier.ABSTRACT);
       }
       else {
         overrides = null;
diff --git a/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java b/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java
index bc7c33cdeda8..227252b0602a 100644
--- a/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java
+++ b/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -224,7 +224,7 @@ public class ClassFilterEditor extends JPanel implements ComponentWithEmptyText
         return filter;
       }
       if (columnIndex == CHECK_MARK) {
-        return filter.isEnabled() ? Boolean.TRUE : Boolean.FALSE;
+        return filter.isEnabled();
       }
       return null;
     }
diff --git a/platform/lang-impl/src/com/intellij/find/replaceInProject/ReplaceInProjectManager.java b/platform/lang-impl/src/com/intellij/find/replaceInProject/ReplaceInProjectManager.java
index a68623380967..57a299788e9b 100644
--- a/platform/lang-impl/src/com/intellij/find/replaceInProject/ReplaceInProjectManager.java
+++ b/platform/lang-impl/src/com/intellij/find/replaceInProject/ReplaceInProjectManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -262,7 +262,7 @@ public class ReplaceInProjectManager {
           if (virtualFile != null && ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
             @Override
             public Boolean compute() {
-              return virtualFile.isValid() ? Boolean.TRUE : Boolean.FALSE;
+              return virtualFile.isValid();
             }
           }).booleanValue()) {
 
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
index 6467edcd13b7..62f65d78c782 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1436,7 +1436,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
   }
 
   public void setAutoscrollToSource(boolean autoscrollMode, String paneId) {
-    myAutoscrollToSource.put(paneId, autoscrollMode ? Boolean.TRUE : Boolean.FALSE);
+    myAutoscrollToSource.put(paneId, autoscrollMode);
   }
 
   @Override
@@ -1528,7 +1528,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
 
   @NotNull
   private ActionCallback setPaneOption(@NotNull Map<String, Boolean> optionsMap, boolean value, String paneId, final boolean updatePane) {
-    optionsMap.put(paneId, value ? Boolean.TRUE : Boolean.FALSE);
+    optionsMap.put(paneId, value);
     if (updatePane) {
       final AbstractProjectViewPane pane = getProjectViewPaneById(paneId);
       if (pane != null) {
diff --git a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java
index 3b342800269b..a17f76122e76 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -182,7 +182,7 @@ class FilterDialog extends DialogWrapper {
       switch (column) {
         case 0:
           // "Available" column
-          return myFilter.contains(pattern) ? Boolean.TRUE : Boolean.FALSE;
+          return myFilter.contains(pattern);
         case 1:
           // "Pattern" column
           return pattern.getPatternString();
diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java b/platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java
index 865df79f2944..5685abac76eb 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -269,7 +269,7 @@ public abstract class AbstractMemberSelectionTable<T extends PsiElement, M exten
       switch (columnIndex) {
         case CHECKED_COLUMN:
           if (myTable.myMemberInfoModel.isMemberEnabled(memberInfo)) {
-            return memberInfo.isChecked() ? Boolean.TRUE : Boolean.FALSE;
+            return memberInfo.isChecked();
           }
           else {
             return myTable.myMemberInfoModel.isCheckedWhenDisabled(memberInfo);
diff --git a/platform/platform-api/src/com/intellij/ui/ToggleActionButton.java b/platform/platform-api/src/com/intellij/ui/ToggleActionButton.java
index 2643cb628373..9a2cf478fd53 100644
--- a/platform/platform-api/src/com/intellij/ui/ToggleActionButton.java
+++ b/platform/platform-api/src/com/intellij/ui/ToggleActionButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,14 +48,14 @@ public abstract class ToggleActionButton extends AnActionButton implements Toggl
   public final void actionPerformed(AnActionEvent e) {
     final boolean state = !isSelected(e);
     setSelected(e, state);
-    final Boolean selected = state ? Boolean.TRUE : Boolean.FALSE;
+    final Boolean selected = state;
     final Presentation presentation = e.getPresentation();
     presentation.putClientProperty(Toggleable.SELECTED_PROPERTY, selected);
   }
 
   @Override
   public final void updateButton(AnActionEvent e) {
-    final Boolean selected = isSelected(e) ? Boolean.TRUE : Boolean.FALSE;
+    final Boolean selected = isSelected(e);
     final Presentation presentation = e.getPresentation();
     presentation.putClientProperty(Toggleable.SELECTED_PROPERTY, selected);
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java
index 7ae8d39b8ab5..e32e9c24d539 100644
--- a/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -379,7 +379,7 @@ public class DataManagerImpl extends DataManager {
         if (component == null) {
           return null;
         }
-        return IdeKeyEventDispatcher.isModalContext(component) ? Boolean.TRUE : Boolean.FALSE;
+        return IdeKeyEventDispatcher.isModalContext(component);
       }
       if (PlatformDataKeys.CONTEXT_COMPONENT.is(dataId)) {
         return component;
diff --git a/platform/util/src/com/intellij/util/io/BooleanDataDescriptor.java b/platform/util/src/com/intellij/util/io/BooleanDataDescriptor.java
index ff4f5e437b5d..7ac307bd21bf 100644
--- a/platform/util/src/com/intellij/util/io/BooleanDataDescriptor.java
+++ b/platform/util/src/com/intellij/util/io/BooleanDataDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ public class BooleanDataDescriptor extends InlineKeyDescriptor<Boolean> {
 
   @Override
   public Boolean fromInt(int n) {
-    return n != 0 ? Boolean.TRUE : Boolean.FALSE;
+    return n != 0;
   }
 
   @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberInfo.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberInfo.java
index 08ce62a3ddd9..b2dcf4e40317 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberInfo.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public class GrMemberInfo extends MemberInfoBase<GrMember> {
                                                PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_TYPE | PsiFormatUtil.TYPE_AFTER);
       PsiMethod[] superMethods = method.findSuperMethods();
       if (superMethods.length > 0) {
-        overrides = !superMethods[0].hasModifierProperty(PsiModifier.ABSTRACT) ? Boolean.TRUE : Boolean.FALSE;
+        overrides = !superMethods[0].hasModifierProperty(PsiModifier.ABSTRACT);
       }
       else {
         overrides = null;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberSelectionTable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberSelectionTable.java
index e50828468907..1fb2adbe7447 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberSelectionTable.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/classMembers/GrMemberSelectionTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ public class GrMemberSelectionTable extends AbstractMemberSelectionTable<GrMembe
       return myMemberInfoModel.isAbstractWhenDisabled(memberInfo);
     }
     else {
-      return memberInfo.isToAbstract() ? Boolean.TRUE : Boolean.FALSE;
+      return memberInfo.isToAbstract();
     }
   }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ParameterTablePanel.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ParameterTablePanel.java
index 8ec892ad3a4e..9b9a9ffbd3f5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ParameterTablePanel.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ParameterTablePanel.java
@@ -279,7 +279,7 @@ public abstract class ParameterTablePanel extends JPanel {
     public Object getValueAt(int rowIndex, int columnIndex) {
       switch (columnIndex) {
         case CHECKMARK_COLUMN: {
-          return myParameterInfos[rowIndex].passAsParameter() ? Boolean.TRUE : Boolean.FALSE;
+          return myParameterInfos[rowIndex].passAsParameter();
         }
         case PARAMETER_NAME_COLUMN: {
           return myParameterInfos[rowIndex].getName();
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java
index dcffa18e387d..7ed641645043 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -163,7 +163,7 @@ public class SelectFilesDialog extends DialogWrapper implements ActionListener {
     }
 
     public void setChecked(final String entry, final boolean checked) {
-      mySelectedFiles.put(entry, checked ? Boolean.TRUE : Boolean.FALSE);
+      mySelectedFiles.put(entry, checked);
       getOKAction().setEnabled(isOKActionEnabled());
     }