Removed dependency on six