Removed dependency to CoreLocation and MapKit