remove six dependence which was breaking some versions and add function prototype matching