Cleaning up the location codes