pygost/asn1schemas/cms.py    | 14 --------------
 pygost/asn1schemas/prvkey.py |  2 +-
 pygost/test_pfx.py           |  1 +

diff --git a/pygost/asn1schemas/cms.py b/pygost/asn1schemas/cms.py
index f7e60e92194f016fa3e1905d59c513356fd6c2738f9607720a390cc5726fffa9..9877098fed51a0ff381922edda8b4ab41905f4f3befd428c271f4c476edd10c7 100644
--- a/pygost/asn1schemas/cms.py
+++ b/pygost/asn1schemas/cms.py
@@ -389,20 +389,6 @@ class SignerInfos(SetOf):
     schema = SignerInfo()
 
 
-class CertificateChoices(Choice):
-    schema = (
-        ("certificate", Certificate()),
-        # ("extendedCertificate", ExtendedCertificate(impl=tag_ctxp(0))),
-        # ("v1AttrCert", AttributeCertificateV1(impl=tag_ctxc(1))),  # V1 is osbolete
-        # ("v2AttrCert", AttributeCertificateV2(impl=tag_ctxc(2))),
-        # ("other", OtherCertificateFormat(impl=tag_ctxc(3))),
-    )
-
-
-class CertificateSet(SetOf):
-    schema = CertificateChoices()
-
-
 class SignedData(Sequence):
     schema = (
         ("version", CMSVersion()),
diff --git a/pygost/asn1schemas/prvkey.py b/pygost/asn1schemas/prvkey.py
index 1fe877d4e5dde9cd2c2766128e3aa8cd1bfb98ac2a1959a0b02a97f08590604f..5c796feafa9416dde787be443ac7d64831dbdddf194c8c22a374fd42945905e9 100644
--- a/pygost/asn1schemas/prvkey.py
+++ b/pygost/asn1schemas/prvkey.py
@@ -22,9 +22,9 @@ from pyderasn import Null
 from pyderasn import ObjectIdentifier
 from pyderasn import OctetString
 from pyderasn import Sequence
+from pyderasn import SetOf
 from pyderasn import tag_ctxc
 from pyderasn import tag_ctxp
-from pyderasn import SetOf
 
 from pygost.asn1schemas.oids import id_tc26_gost3410_2012_256
 from pygost.asn1schemas.oids import id_tc26_gost3410_2012_512
diff --git a/pygost/test_pfx.py b/pygost/test_pfx.py
index bb200c8388182e6e69ee3a721c3d5faaf966a3722c3a600e585b69eaf5fd6dd9..9907d2d7936fbf81cf093c53301cacbf526f0de6ce408b671ab910acdfdf309a 100644
--- a/pygost/test_pfx.py
+++ b/pygost/test_pfx.py
@@ -37,6 +37,7 @@
 
 try:
     from pyderasn import OctetString
+
     from pygost.asn1schemas.cms import EncryptedData
     from pygost.asn1schemas.cms import EnvelopedData
     from pygost.asn1schemas.cms import SignedAttributes