diff --git a/app/models/qbo_invoice.rb b/app/models/qbo_invoice.rb
index 9fce03b..1982ffa 100644
--- a/app/models/qbo_invoice.rb
+++ b/app/models/qbo_invoice.rb
@@ -19,25 +19,15 @@ class QboInvoice < ActiveRecord::Base
   end
   
   def self.update_all 
-    service = get_base.service
-    
-    
-    # Update the item table
-    service.all.each { |invoice|
-      qbo_invoice = find_or_create_by(id: invoice.id)
-      qbo_invoice.doc_number = invoice.doc_number 
-      qbo_invoice.id = invoice.id
-      qbo_invoice.save!
-    }
-    
-    #remove deleted invoices
-    all.each { |invoice|
-      begin
-        service.fetch_by_id(invoice.id)
-      rescue
-        delete_all(id: invoice.id)
-      end
-    }
+    invoices = get_base.service.all
+    # Update the invoice table 
+    invoices.each { | invoice | 
+	    qbo_invoice = find_or_create_by(id: invoice.id) 
+	    qbo_invoice.doc_number = invoice.doc_number 
+	    qbo_invoice.save! 
+    } 
+    #remove deleted invoices 
+    where.not(invoices.map(&:id)).destroy
   end
   
   def self.update(id)