Remove dependency on six