--- a/setup.py	2017-12-30 00:12:35.000000000 +0100
+++ b/setup.py	2018-04-29 20:51:23.000000000 +0200
@@ -5,7 +5,7 @@
 import platform
 import sys
 
-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
+deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six']
 
 if sys.version_info < (2,7):
     deps += ['importlib', "protobuf==3.4.0"]
--- a/yowsup/env/env.py	2017-12-30 00:12:35.000000000 +0100
+++ b/yowsup/env/env.py	2018-04-29 20:51:44.000000000 +0200
@@ -13,7 +13,6 @@
         super(YowsupEnvType, cls).__init__(name, bases, dct)
 
 class YowsupEnv(with_metaclass(YowsupEnvType, object)):
-    __metaclass__ = YowsupEnvType
     __ENVS = {}
     __CURR = None
 
--- a/yowsup/layers/protocol_media/picture.py	2017-12-30 00:12:35.000000000 +0100
+++ b/yowsup/layers/protocol_media/picture.py	2018-04-29 20:52:30.000000000 +0200
@@ -1,5 +1,5 @@
 from yowsup.layers import YowLayer
-from yowsup import ProtocolTreeNode
+from yowsup.structs import ProtocolTreeNode
 from .mediadownloader import MediaDownloader
 import shutil, os, logging
 logger = logging.getLogger(__name__)
