Moved maps and geolocation to separate services