NXP-13793: cleanup work constructor