Remove most of six.py