first cleanup, needs client -> worker, master -> client refactor