Revert "Add new work accaunting"

This reverts commit 193e95608822a6f0f99ac14053f3e5095da25c55.