Working on cleanup

passing the worker id to the server interface