This update simplifies internal code used by approvals and invoice extraction, removing outdated dependencies. Users should not see functional changes, but the cleanup helps make future maintenance and improvements easier.

* = account_invoice_extract, approvals

Part of task-2338825
Makes task-2261221 and task-2431526 obsolete