completely got rid of duplicate location and geoLocation