less watcher, small cleanup