Removed the CoreLocation dependency