Remove map unavailable location popup

- ...and minor refactoring