diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/AreaPicoContainerImpl.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/AreaPicoContainerImpl.java
index 14e81e91e081..099421ab6122 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/impl/AreaPicoContainerImpl.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/AreaPicoContainerImpl.java
@@ -26,7 +26,6 @@ import org.picocontainer.alternatives.AbstractDelegatingMutablePicoContainer;
 /**
  * @author Alexander Kireyev
  */
-@SuppressWarnings({"unchecked"})
 class AreaPicoContainerImpl extends AbstractDelegatingMutablePicoContainer implements AreaPicoContainer {
   private final AreaInstance myAreaInstance;
 
diff --git a/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java b/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java
index 2a319eb07638..49959390248f 100644
--- a/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java
+++ b/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java
@@ -61,7 +61,7 @@ class XmlSerializerImpl {
     if (type instanceof Class) {
       return _getClassBinding((Class<?>)type, type, accessor);
     }
-    else if (type instanceof ParameterizedType) {
+    if (type instanceof ParameterizedType) {
       ParameterizedType parameterizedType = (ParameterizedType)type;
       Type rawType = parameterizedType.getRawType();
       assert rawType instanceof Class;
@@ -154,7 +154,7 @@ class XmlSerializerImpl {
   }
 
   public static boolean isIgnoredNode(final Object child) {
-    if (child instanceof Text && ((Text)child).getValue().trim().length() == 0) {
+    if (child instanceof Text && ((Text)child).getValue().trim().isEmpty()) {
       return true;
     }
     if (child instanceof Comment) {
@@ -163,7 +163,7 @@ class XmlSerializerImpl {
     if (child instanceof Attribute) {
       Attribute attr = (Attribute)child;
       final String namespaceURI = attr.getNamespaceURI();
-      if (namespaceURI != null && namespaceURI.length() > 0) return true;
+      if (namespaceURI != null && !namespaceURI.isEmpty()) return true;
     }
 
     return false;