Cleanup country and state lists