clean up of clustering. Now the embedded worker works fine