Remove old singleton model
Finish Forward resendInvoice