Clear working dir
Revert a344961..da70e73

This rolls back to commit a34496118f5e04d21a672b3788fc5ab5d5d9166d.