Remove dependncy on six