Added option to remove existing old working directory