Removed more dependencies on six