Clean up lingering code cruft from previous client worker implementation

[rheimus]

Version: 4.0.0-alpha.1

There is a bunch of cruft lingering around, old comments and obsolete code etc.

This should be removed or updated where appropriate.