Remove six dependency