Cleaning-up different geo-codings (not yet finished...)