Remove dirty Python 3 fix
Multiple Python version support clean fix