more cleanup in the watcher