Fixing workdir rm bug
190 files changed