Update watcher to properly cleanup tmp/ dir