[watcher] unmaintained branch cleanup