a bit more cleanup of jurisdictions