completely got rid of dulicate location and geoLocation