Cleanup to use popitem, since we just want the k,v pair anyways