Revert "InvoicingSystem"

This reverts commit 959a70fc9772a72600bf328d76cd710e1ff356ce.