Further cleanup
Remove dependency on six