clean up and watcher