                 let title = String.fromCString(UnsafePointer<CChar>(sqlite3_column_text(results, 3)))!
                 let description = String.fromCString(UnsafePointer<CChar>(sqlite3_column_text(results, 4)))!
                 let url = String.fromCString(UnsafePointer<CChar>(sqlite3_column_text(results, 5)))!
-                let faviconId = sqlite3_column_int(results, 6)
                 
                 let bk = Bookmark.add(url: NSURL(string: url), title: title, customTitle: description, parentFolder: relationshipHash[parentid] ?? nil, isFolder: (type == 2))
                 relationshipHash[guid] = bk
-                faviconHash[faviconId] = bk
-            }
-        } else {
-            debugPrint("SELECT statement could not be prepared")
-        }
-        
-        if sqlite3_finalize(results) != SQLITE_OK {
-            let error = String.fromCString(sqlite3_errmsg(db))
-            debugPrint("Error finalizing prepared statement: \(error)")
-        }
-        results = nil
-        completed(success: true)
-    }
-    
-    internal var domainHash: [Int32: Domain] = [:]
-    
-    private func migrateDomainData(completed: (success: Bool) -> Void) {
-        let query: String = "SELECT id, domain, showOnTopSites FROM domains"
-        var results: COpaquePointer = nil
-        
-        if sqlite3_prepare_v2(db, query, -1, &results, nil) == SQLITE_OK {
-            while sqlite3_step(results) == SQLITE_ROW {
-                let id = sqlite3_column_int(results, 0)
-                let domain = String.fromCString(UnsafePointer<CChar>(sqlite3_column_text(results, 1)))!
-                let showOnTopSites = sqlite3_column_int(results, 2)
-                
-                if let d = Domain.getOrCreateForUrl(NSURL(string: domain)!, context: DataController.moc) {
-                    d.topsite = (showOnTopSites == 1)
-                    domainHash[id] = d
-                }
-            }
-            DataController.saveContext()
-        } else {
-            debugPrint("SELECT statement could not be prepared")
-        }
-        
-        if sqlite3_finalize(results) != SQLITE_OK {
-            let error = String.fromCString(sqlite3_errmsg(db))
-            debugPrint("Error finalizing prepared statement: \(error)")
-        }
-        results = nil
-        completed(success: true)
-    }
-    
-    private func migrateHistory(completed: (success: Bool) -> Void) {
-        let query: String = "SELECT url, title FROM history WHERE is_deleted = 0"
-        var results: COpaquePointer = nil
-        
-        if sqlite3_prepare_v2(db, query, -1, &results, nil) == SQLITE_OK {
-            while sqlite3_step(results) == SQLITE_ROW {
-                let url = String.fromCString(UnsafePointer<CChar>(sqlite3_column_text(results, 0)))!
-                let title = String.fromCString(UnsafePointer<CChar>(sqlite3_column_text(results, 1)))!
-                
-                History.add(title: title, url: NSURL(string: url)!)
-            }
-        } else {
-            debugPrint("SELECT statement could not be prepared")
-        }
-        
-        if sqlite3_finalize(results) != SQLITE_OK {
-            let error = String.fromCString(sqlite3_errmsg(db))
-            debugPrint("Error finalizing prepared statement: \(error)")
-        }
-        results = nil
-        completed(success: true)
-    }
-    
-    internal var domainFaviconHash: [Int32: Domain] = [:]
-    
-    private func buildDomainFaviconHash() {
-        let query: String = "SELECT siteID, faviconID FROM favicon_sites"
-        var results: COpaquePointer = nil
-        
-        if sqlite3_prepare_v2(db, query, -1, &results, nil) == SQLITE_OK {
-            while sqlite3_step(results) == SQLITE_ROW {
-                let domainId = sqlite3_column_int(results, 0)
-                let faviconId = sqlite3_column_int(results, 1)
-                if let domain = domainHash[domainId] {
-                    domainFaviconHash[faviconId] = domain
-                }
-            }
-        } else {
-            debugPrint("SELECT statement could not be prepared")
-        }
-        
-        if sqlite3_finalize(results) != SQLITE_OK {
-            let error = String.fromCString(sqlite3_errmsg(db))
-            debugPrint("Error finalizing prepared statement: \(error)")
-        }
-        results = nil
-    }
-    
-    private func migrateFavicons(completed: (success: Bool) -> Void) {
-        buildDomainFaviconHash()
-        
-        let query: String = "SELECT id, url, width, height, type FROM favicons"
-        var results: COpaquePointer = nil
-        
-        if sqlite3_prepare_v2(db, query, -1, &results, nil) == SQLITE_OK {
-            while sqlite3_step(results) == SQLITE_ROW {
-                let id = sqlite3_column_int(results, 0)
-                let url = String.fromCString(UnsafePointer<CChar>(sqlite3_column_text(results, 1)))!
-                let width = sqlite3_column_int(results, 2)
-                let height = sqlite3_column_int(results, 3)
-                let type = sqlite3_column_int(results, 4)
-                
-                let favicon = Favicon(url: url, type: IconType(rawValue: Int(type))!)
-                favicon.width = Int(width)
-                favicon.height = Int(height)
-                
-                if let domain = domainFaviconHash[id] {
-                    if let url = domain.url {
-                        FaviconMO.add(favicon: favicon, forSiteUrl: NSURL(string: url)!)
-                    }
-                }
             }
         } else {
             debugPrint("SELECT statement could not be prepared")

        return true
    }
    
    internal var faviconHash: [Int32: NSManagedObjectID] = [:]
    
    private func migrateBookmarks(completed: (success: Bool) -> Void) {
        let query: String = "SELECT guid, type, parentid, title, description, bmkUrl, faviconID FROM bookmarksLocal WHERE is_deleted = 0"

            debugPrint("Cannot clear profile data: \(error)")
            completed(success: false)
        }
    }
    
    private func checkCompleted() {
