             // to be able to handle. Currently, that means only taskReference activities with an identifier that
             // maps to a known task.
             self.activities = scheduledActivities.filter({ (activity) -> Bool in
-                guard (activity.activity.task != nil), let taskRef = self.bridgeInfo.taskReferenceWithIdentifier(activity.activity.task.identifier) else {
-                    return false
-                }
-                self.taskReferenceMap[activity.guid] = taskRef
-                return true
+                return (activity.activity.task != nil) &&
+                       (self.bridgeInfo.taskReferenceWithIdentifier(activity.activity.task.identifier) != nil)
             })
             
             // reload table

    
    public func scheduledActivityAtIndexPath(indexPath: NSIndexPath) -> SBBScheduledActivity? {
        return activities[indexPath.row]
    }
    
    public func dequeueReusableCell(tableView: UITableView, indexPath: NSIndexPath) -> UITableViewCell {


public class SBAActivityTableViewController: UITableViewController, SBASharedInfoController, ORKTaskViewControllerDelegate {
    
    private var activities: [SBBScheduledActivity] = []
    
    override public func viewWillAppear(animated: Bool) {
        super.viewWillAppear(animated)
        self.reloadData()
    }
    
    // MARK: Customizable implementations
    
