Light cleanup of Watcher