         if let userInfoDict : [NSObject : AnyObject] = notification.userInfo {
             if let uuidString = userInfoDict[Site.PropertyKey.uuidKey] as? String {
                 let uuid = NSUUID(UUIDString: uuidString) // Get the uuid from the notification.
-                let site = sites.filter{ $0.uuid == uuid }.first // Use the uuid value to get the site object from the array.
-                let siteIndex = find(sites, site!) // Use the site object to get its index position in the array.
+//                let site = sites.filter{ $0.uuid == uuid }.first // Use the uuid value to get the site object from the array.
+//                let siteIndex = find(sites, site!) // Use the site object to get its index position in the array.
                 
-                site?.notifications.removeAtIndex(find(site!.notifications, notification)!)
-                AppDataManager.sharedInstance.updateSite(site!)
-                AppDataManager.sharedInstance.currentSiteIndex = siteIndex!
+//                site?.notifications.removeAtIndex(find(site!.notifications, notification)!)
+       
                 
                 // println("User tapped on notification for site: \(site) at index \(siteIndex)")
                 

                    if let siteIndex = find(sites, site) { // Use the site object to get its index position in the array.
                        AppDataManager.sharedInstance.currentSiteIndex = siteIndex
                        if let notificationIndex  = find(site.notifications, notification) {
                            site.notifications.removeAtIndex(notificationIndex)
                            // println("User tapped on notification for site: \(site) at index \(siteIndex)")
                            
                            let url = NSURL(string: "nightscouter://link/\(UIStoryboard.StoryboardViewControllerIdentifier.SiteListPageViewController.rawValue)")

        setupNotificationSettings() // Need to move this to when the user adds a server valid to the array.
        
        AppThemeManager.themeApp
        window?.tintColor = Theme.Color.windowTintColor
        
        return true
    }
