DATAES-6 , Add ability to let NodeClient clean up working directory