unit: drop old legacy payload code
Merge pull request #990 from bcwaldon/drop-legacy-code

unit: drop old legacy payload code