         }
     }
     
-    func weatherForLocationItemsWithoutId(locationItems: [LocationItem], callback: ([WeatherDataItem]?, NSError?) -> Void) {
-        let locations = locationItems.filter({
-            $0.weatherApiId == 0
-        }).map({
-            "\($0.name), \($0.isoCountryCode)"
-        })
-        
-        if locations.count > 0 {
-            
-        } else {
-            callback([], nil)
-        }
-    }
-    
     func weatherForCurrentLocation(callback: (WeatherDataItem?, NSError?) -> Void) {
         self.currentLocation {(placemark, error) in
             if let placemark = placemark {
-                let location = "\(placemark.locality),\(placemark.ISOcountryCode)"
+                let location = "\(placemark.locality)" //,\(placemark.ISOcountryCode)"
                 self.communicator.currentWeatherForLocation(location) {(json, error) in
                     var weatherDataItem: WeatherDataItem?
                     if let json = json {

                callback(weatherDataItems?[0], error)
            }
        } else {
            let location = "\(locationItem.name),\(locationItem.isoCountryCode)"
            self.communicator.currentWeatherForLocation(location) {(json, error) in
                var weatherDataItem: WeatherDataItem?
                if let json = json {

    func forecastForCurrentLocation(callback: ([WeatherDataItem]?, NSError?) -> Void) {
        self.currentLocation {(placemark, error) in
            if let placemark = placemark {
                let location = "\(placemark.locality)" //,\(placemark.ISOcountryCode)"
                self.communicator.dailyForecastWeatherForLocation(location, forDays: self.numberOfForecastedDays) {(json, error) in
                    var weatherDataItems: [WeatherDataItem] = []
                    if let json = json {
