Removed junk again and use new geo data.