Removes Core Data dependency