[WIP] Remove inverse invoice_state