geolocation and refactoring
remove