fixed geolocation
removed obsolete code