diff --git a/python/helpers/StdlibTypes.properties b/python/helpers/StdlibTypes.properties
index 70c9becc06be..402f27baa73f 100644
--- a/python/helpers/StdlibTypes.properties
+++ b/python/helpers/StdlibTypes.properties
@@ -3,566 +3,6 @@
 
 ## 5.6. Sequence types
 
-__builtin__.bytes.__init__ = \
-  :rtype: bytes \n\
-
-__builtin__.bytes.__add__ = \
-  :type y: bytes \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.__mul__ = \
-  :type n: int \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.__mod__ = \
-  :type y: object \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.__rmul__ = \
-  :type n: int \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.__rmod__ = \
-  :type y: object \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.__getitem__ = \
-  :type y: int \n\
-  :rtype: int \n\
-
-__builtin__.bytes.__iter__ = \
-  :rtype: collections.Iterator of int \n\
-
-__builtin__.bytes.capitalize = \
-  :rtype: bytes \n\
-
-__builtin__.bytes.center = \
-  :type width: int \n\
-  :type fillchar: bytes or None \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.count = \
-  :type sub: bytes \n\
-  :type start: int or None \n\
-  :type end: int or None \n\
-  :rtype: int \n\
-
-__builtin__.bytes.decode = \
-  :type encoding: str \n\
-  :type errors: str or None \n\
-  :rtype: str \n\
-
-# Python 3: No bytes.encode
-__builtin__.bytes.encode = \
-  :type encoding: str \n\
-  :type errors: str or None \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.endswith = \
-  :type suffix: bytes \n\
-  :type start: int or None \n\
-  :type end: int or None \n\
-  :rtype: bool \n\
-
-__builtin__.bytes.find = \
-  :type sub: bytes \n\
-  :type start: int or None \n\
-  :type end: int or None \n\
-  :rtype: int \n\
-
-__builtin__.bytes.index = \
-  :type sub: bytes \n\
-  :type start: int or None \n\
-  :type end: int or None \n\
-  :rtype: int \n\
-
-__builtin__.bytes.isalnum = \
-  :rtype: bool \n\
-
-__builtin__.bytes.isalpha = \
-  :rtype: bool \n\
-
-__builtin__.bytes.isdigit = \
-  :rtype: bool \n\
-
-__builtin__.bytes.islower = \
-  :rtype: bool \n\
-
-__builtin__.bytes.isspace = \
-  :rtype: bool \n\
-
-__builtin__.bytes.istitle = \
-  :rtype: bool \n\
-
-__builtin__.bytes.isupper = \
-  :rtype: bool \n\
-
-__builtin__.bytes.join = \
-  :type iterable: collections.Iterable of bytes \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.ljust = \
-  :type width: int \n\
-  :type fillchar: bytes or None \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.lower = \
-  :rtype: bytes \n\
-
-__builtin__.bytes.lstrip = \
-  :type chars: bytes or None \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.partition = \
-  :type sep: bytes \n\
-  :rtype: (bytes, bytes, bytes) \n\
-
-__builtin__.bytes.replace = \
-  :type old: bytes \n\
-  :type new: bytes \n\
-  :type count: int \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.rfind = \
-  :type sub: bytes \n\
-  :type start: int or None \n\
-  :type end: int or None \n\
-  :rtype: int \n\
-
-__builtin__.bytes.rindex = \
-  :type sub: bytes \n\
-  :type start: int or None \n\
-  :type end: int or None \n\
-  :rtype: int \n\
-
-__builtin__.bytes.rpartition = \
-  :type sep: bytes \n\
-  :rtype: (bytes, bytes, bytes) \n\
-
-__builtin__.bytes.rsplit = \
-  :type sep: bytes or None \n\
-  :type maxsplit: int or None \n\
-  :rtype: list of bytes \n\
-
-__builtin__.bytes.rstrip = \
-  :type chars: bytes or None \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.split = \
-  :type sep: bytes or None \n\
-  :type maxsplit: int or None \n\
-  :rtype: list of bytes \n\
-
-__builtin__.bytes.splitlines = \
-  :type keepends: bool or int or None \n\
-  :rtype: list of bytes \n\
-
-__builtin__.bytes.startswith = \
-  :type prefix: bytes \n\
-  :type start: int or None \n\
-  :type end: int or None \n\
-  :rtype: bool \n\
-
-__builtin__.bytes.strip = \
-  :type chars: bytes or None \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.swapcase = \
-  :rtype: bytes \n\
-
-__builtin__.bytes.title = \
-  :rtype: bytes \n\
-
-__builtin__.bytes.translate = \
-  :type table: object \n\
-  :type deletechars: bytes \n\
-  :rtype: bytes \n\
-
-__builtin__.bytes.upper = \
-  :rtype: bytes \n\
-
-__builtin__.bytes.zfill = \
-  :type width: int \n\
-  :rtype: bytes \n\
-
-__builtin__.str.__init__ = \
-  :rtype: str \n\
-
-__builtin__.str.__add__ = \
-  :type y: string \n\
-  :rtype: string \n\
-
-__builtin__.str.__mul__ = \
-  :type n: int or long \n\
-  :rtype: str \n\
-
-__builtin__.str.__mod__ = \
-  :type y: object \n\
-  :rtype: str \n\
-
-__builtin__.str.__rmul__ = \
-  :type n: int or long \n\
-  :rtype: str \n\
-
-__builtin__.str.__rmod__ = \
-  :type y: object \n\
-  :rtype: str \n\
-
-__builtin__.str.__getitem__ = \
-  :type y: int \n\
-  :rtype: str \n\
-
-__builtin__.str.__iter__ = \
-  :rtype: collections.Iterator of str \n\
-
-__builtin__.str.capitalize = \
-  :rtype: str \n\
-
-__builtin__.str.center = \
-  :type width: int or long \n\
-  :type fillchar: str or None \n\
-  :rtype: str \n\
-
-__builtin__.str.count = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-# Python 3: No str.decode
-__builtin__.str.decode = \
-  :type encoding: string \n\
-  :type errors: string or None \n\
-  :rtype: unicode \n\
-
-__builtin__.str.encode = \
-  :type encoding: string \n\
-  :type errors: string or None \n\
-  :rtype: bytes \n\
-
-__builtin__.str.endswith = \
-  :type suffix: string or tuple \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: bool \n\
-
-__builtin__.str.find = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-__builtin__.str.format = \
-  :rtype: str \n\
-
-__builtin__.str.index = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-__builtin__.str.isalnum = \
-  :rtype: bool \n\
-
-__builtin__.str.isalpha = \
-  :rtype: bool \n\
-
-__builtin__.str.isdigit = \
-  :rtype: bool \n\
-
-__builtin__.str.islower = \
-  :rtype: bool \n\
-
-__builtin__.str.isspace = \
-  :rtype: bool \n\
-
-__builtin__.str.istitle = \
-  :rtype: bool \n\
-
-__builtin__.str.isupper = \
-  :rtype: bool \n\
-
-__builtin__.str.join = \
-  :type iterable: collections.Iterable of string \n\
-  :rtype: string \n\
-
-__builtin__.str.ljust = \
-  :type width: int or long \n\
-  :type fillchar: str or None \n\
-  :rtype: str \n\
-
-__builtin__.str.lower = \
-  :rtype: str \n\
-
-__builtin__.str.lstrip = \
-  :type chars: string or None \n\
-  :rtype: str \n\
-
-__builtin__.str.next = \
-  :rtype: str \n\
-
-__builtin__.str.partition = \
-  :type sep: string \n\
-  :rtype: (str, str, str) \n\
-
-__builtin__.str.replace = \
-  :type old: string \n\
-  :type new: string \n\
-  :type count: int or long \n\
-  :rtype: string \n\
-
-__builtin__.str.rfind = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-__builtin__.str.rindex = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-__builtin__.str.rpartition = \
-  :type sep: string \n\
-  :rtype: (str, str, str) \n\
-
-__builtin__.str.rsplit = \
-  :type sep: string or None \n\
-  :type maxsplit: int or long or None \n\
-  :rtype: list of str \n\
-
-__builtin__.str.rstrip = \
-  :type chars: string or None \n\
-  :rtype: str \n\
-
-__builtin__.str.split = \
-  :type sep: string or None \n\
-  :type maxsplit: int or long or None \n\
-  :rtype: list of str \n\
-
-__builtin__.str.splitlines = \
-  :type keepends: bool or int or long or None \n\
-  :rtype: list of str \n\
-
-__builtin__.str.startswith = \
-  :type prefix: string or tuple \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: bool \n\
-
-__builtin__.str.strip = \
-  :type chars: string or None \n\
-  :rtype: str \n\
-
-__builtin__.str.swapcase = \
-  :rtype: str \n\
-
-__builtin__.str.title = \
-  :rtype: str \n\
-
-__builtin__.str.translate = \
-  :type table: object \n\
-  :type deletechars: str \n\
-  :rtype: str \n\
-
-__builtin__.str.upper = \
-  :rtype: str \n\
-
-__builtin__.str.zfill = \
-  :type width: int or long \n\
-  :rtype: str \n\
-
-__builtin__.unicode.__init__ = \
-  :rtype: unicode \n\
-
-__builtin__.unicode.__add__ = \
-  :type y: string \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.__mul__ = \
-  :type n: int or long \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.__mod__ = \
-  :type y: object \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.__rmul__ = \
-  :type n: int or long \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.__rmod__ = \
-  :type y: object \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.__getitem__ = \
-  :type y: int \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.format = \
-  :rtype: unicode \n\
-
-__builtin__.unicode.capitalize = \
-  :rtype: unicode \n\
-
-__builtin__.unicode.center = \
-  :type width: int or long \n\
-  :type fillchar: unicode or None \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.count = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-__builtin__.unicode.decode = \
-  :type encoding: string \n\
-  :type errors: string or None \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.encode = \
-  :type encoding: string \n\
-  :type errors: string or None \n\
-  :rtype: bytes \n\
-
-__builtin__.unicode.endswith = \
-  :type suffix: string or tuple \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: bool \n\
-
-__builtin__.unicode.find = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-__builtin__.unicode.index = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-__builtin__.unicode.isalnum = \
-  :rtype: bool \n\
-
-__builtin__.unicode.isalpha = \
-  :rtype: bool \n\
-
-__builtin__.unicode.isdecimal = \
-  :rtype: bool \n\
-
-__builtin__.unicode.isdigit = \
-  :rtype: bool \n\
-
-__builtin__.unicode.islower = \
-  :rtype: bool \n\
-
-__builtin__.unicode.isnumeric = \
-  :rtype: bool \n\
-
-__builtin__.unicode.isspace = \
-  :rtype: bool \n\
-
-__builtin__.unicode.istitle = \
-  :rtype: bool \n\
-
-__builtin__.unicode.isupper = \
-  :rtype: bool \n\
-
-__builtin__.unicode.join = \
-  :type iterable: collections.Iterable of string \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.ljust = \
-  :type width: int or long \n\
-  :type fillchar: string or None \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.lower = \
-  :rtype: unicode \n\
-
-__builtin__.unicode.lstrip = \
-  :type chars: string or None \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.next = \
-  :rtype: unicode \n\
-
-__builtin__.unicode.partition = \
-  :type sep: string \n\
-  :rtype: (unicode, unicode, unicode) \n\
-
-__builtin__.unicode.replace = \
-  :type old: string \n\
-  :type new: string \n\
-  :type count: int or long \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.rfind = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-__builtin__.unicode.rindex = \
-  :type sub: string \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: int \n\
-
-__builtin__.unicode.rpartition = \
-  :type sep: string \n\
-  :rtype: (unicode, unicode, unicode) \n\
-
-__builtin__.unicode.rsplit = \
-  :type sep: string or None \n\
-  :type maxsplit: int or long or None \n\
-  :rtype: list of unicode \n\
-
-__builtin__.unicode.rstrip = \
-  :type chars: string or None \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.split = \
-  :type sep: string or None \n\
-  :type maxsplit: int or long or None \n\
-  :rtype: list of unicode \n\
-
-__builtin__.unicode.splitlines = \
-  :type keepends: bool or int or long or None \n\
-  :rtype: list of unicode \n\
-
-__builtin__.unicode.startswith = \
-  :type prefix: string or tuple \n\
-  :type start: int or long or None \n\
-  :type end: int or long or None \n\
-  :rtype: bool \n\
-
-__builtin__.unicode.strip = \
-  :type chars: string or None \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.swapcase = \
-  :rtype: unicode \n\
-
-__builtin__.unicode.title = \
-  :rtype: unicode \n\
-
-__builtin__.unicode.translate = \
-  :type table: object \n\
-  :type deletechars: string \n\
-  :rtype: unicode \n\
-
-__builtin__.unicode.upper = \
-  :rtype: unicode \n\
-
-__builtin__.unicode.zfill = \
-  :type width: int or long \n\
-  :rtype: unicode \n\
-
 __builtin__.list.__init__ = \
   :type seq: collections.Iterable of T \n\
   :rtype: list of T \n\
diff --git a/python/testSrc/com/jetbrains/python/PyTypeTest.java b/python/testSrc/com/jetbrains/python/PyTypeTest.java
index 5fa7cd7db11e..09de39cab8ce 100644
--- a/python/testSrc/com/jetbrains/python/PyTypeTest.java
+++ b/python/testSrc/com/jetbrains/python/PyTypeTest.java
@@ -29,7 +29,7 @@ public class PyTypeTest extends PyTestCase {
            "expr = 1 + 2");
     doTest("str | unicode",
            "expr = '1' + '2'");
-    doTest("str",
+    doTest("str | unicode",
            "expr = '%s' % ('a')");
     doTest("list[int]",
            "expr = [1] + [2]");